libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-04 17:29:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

WATCHMAKER: Drop \n from calls to warning(

Browse Source
This commit is contained in:
Einar Johan Trøan Sømåen 2022-09-11 15:29:35 +02:00 committed by Eugene Sandulenko
parent 35ee83f68d
commit d52d67482d
40 changed files with 185 additions and 185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engines/watchmaker/3d/animation.cpp
View File

@ -211,7 +211,7 @@ int8 t3dLoadAnimation(WGame &game, const char *s, t3dMESH *mesh, uint16 Flag) {
{
auto stream = game.resolveFile(name);
if (!stream) {
warning("File %s not found\n", name);
warning("File %s not found", name);
return -1;
}
@ -569,7 +569,7 @@ t3dBODY *LoadShadowMeshes(WGame &game, const char *pname, t3dBODY *Body) {
* t3dLoadCharacter
* --------------------------------------------------*/
t3dCHARACTER *t3dLoadCharacter(WGame &game, const char *pname, t3dCHARACTER *b, uint16 num) {
warning("LoadCharacter(%s)\n", pname);
warning("LoadCharacter(%s)", pname);
uint8 Mirror = 1;
uint16 n = 0, f, i;
t3dV3F tmp;
@ -585,7 +585,7 @@ t3dCHARACTER *t3dLoadCharacter(WGame &game, const char *pname, t3dCHARACTER *b,
if (num >= 2) b->Flags |= T3D_CHARACTER_BNDHIDE;
//Try to load animation
if (t3dLoadAnimation(game, pname, b->Mesh, T3D_MESH_DEFAULTANIM) == -1) {
warning("t3dLoadCharacter: Error loading %s\n", pname);
warning("t3dLoadCharacter: Error loading %s", pname);
return nullptr;
}
FixupAnim(b->Mesh, 0, "");

16
engines/watchmaker/3d/geometry.cpp
View File

@ -419,7 +419,7 @@ void t3dReleaseBody(t3dBODY *b) {
* t3dReleaseCharacter
* --------------------------------------------------*/
void t3dReleaseCharacter(t3dCHARACTER *b) {
warning("STUBBED: t3dReleaseCharacter\n");
warning("STUBBED: t3dReleaseCharacter");
#if 0
t3dU32 i, j;
@ -1325,7 +1325,7 @@ t3dF32 t3dCheckWithFloor(void) {
* t3dProcessMirror
* --------------------------------------------------*/
void t3dProcessMirror(t3dMESH *mesh, t3dCAMERA *cam) {
warning("STUBBED: t3dProcessMirror\n");
warning("STUBBED: t3dProcessMirror");
#if 0
// t3dBODY *NewBody=NULL;
t3dV3F appo, c0;
@ -1855,7 +1855,7 @@ void t3dAddTextureBufferShadow(t3dCHARACTER *c, uint32 CurShadowBox, t3dLIGHT *l
gVertex *gv, *pc;
t3dV3F v, tmp, MinSco, MaxSco, Aspect, BBox[8], dir;
warning("TODO: t3dAddTextureBufferShadow\n");
warning("TODO: t3dAddTextureBufferShadow");
return;
#if 0
if (!cm || !cm->VertexBuffer)
@ -2449,11 +2449,11 @@ void t3dSetFaceVisibility(t3dMESH *mesh, t3dCAMERA *cam) {
if (*nf + 3 >= target->size()) {
// TODO: Why is this hack necessary?
warning("NumFaces: %d, Size: %d\n", *nf, target->size());
warning("NumFaces: %d, Size: %d", *nf, target->size());
/* static bool warned = false;
if (!warned) {
warned = true;*/
warning("Dropping face\n");
warning("Dropping face");
// }
target->resize(*nf + 4);
//continue;
@ -2647,7 +2647,7 @@ void t3dAddParticle(gMaterial *Material, t3dV3F *Source, t3dF32 size, t3dV3F Col
t3dV3F v0, v1, v2, v3;
uint32 rr, gg, bl, i;
warning("TODO: t3dAddParticle\n");
warning("TODO: t3dAddParticle");
return;
#if 0
uvbc = rGetUserVertexBufferCounter();
@ -2900,7 +2900,7 @@ void t3dCheckMaterialVB(MaterialPtr mat) {
if (i >= mat->NumAllocatedMesh)
return ;
//warning("TODO: Implement t3dCheckMaterialVB\n");
//warning("TODO: Implement t3dCheckMaterialVB");
// gv = rLockVertexPtr(mat->VB, DDLOCK_WRITEONLY | DDLOCK_NOSYSLOCK);
mat->VBO->_buffer.clear();
for (int i = 0; i < mat->NumAllocatedVerts; i++) {
@ -3022,7 +3022,7 @@ void t3dAddLensFlare(gMaterial *Material, t3dV3F *Source, t3dF32 size, t3dF32 pe
t3dV3F v0, v1, v2, v3;
int32 rr, gg, bb;
warning("TODO: t3dAddLensFlare\n");
warning("TODO: t3dAddLensFlare");
return;
#if 0
uvbc = rGetUserVertexBufferCounter();

2
engines/watchmaker/3d/light.cpp
View File

@ -186,7 +186,7 @@ void LoadVolumetricMap(WorkDirs &workDirs, const char *pname, t3dBODY *b) {
* t3dLoadOutdoorLights
* --------------------------------------------------*/
void t3dLoadOutdoorLights(const char *pname, t3dBODY *b, int32 ora) {
warning("STUBBED, t3dLoadOutdoorLights\n");
warning("STUBBED, t3dLoadOutdoorLights");
#if 0
t3dU32 i, j, k;
t3dMESH *m;

62
engines/watchmaker/3d/loader.cpp
View File

@ -133,31 +133,31 @@ t3dCAMERAPATH::t3dCAMERAPATH(Common::SeekableReadStream &stream) {
}
}
void decodeLoaderFlags(uint32 flags) {
warning("%d: T3D_GENERATESHADOWMAPS\n", flags & T3D_GENERATESHADOWMAPS);
warning("%d: T3D_NOLIGHTMAPS\n", flags & T3D_NOLIGHTMAPS);
warning("%d: T3D_NORECURSION\n", flags & T3D_NORECURSION);
warning("%d: T3D_HALFTEXTURESIZE\n", flags & T3D_HALFTEXTURESIZE);
warning("%d: T3D_FULLSCREEN\n", flags & T3D_FULLSCREEN);
warning("%d: T3D_FASTRENDERING\n", flags & T3D_FASTRENDERING);
warning("%d: T3D_OUTDOORLIGHTS\n", flags & T3D_OUTDOORLIGHTS);
warning("%d: T3D_NOVOLUMETRICLIGHTS\n", flags & T3D_NOVOLUMETRICLIGHTS);
warning("%d: T3D_NOBOUNDS\n", flags & T3D_NOBOUNDS);
warning("%d: T3D_NOCAMERAS\n", flags & T3D_NOCAMERAS);
warning("%d: T3D_NONEXCLUSIVEMOUSE\n", flags & T3D_NONEXCLUSIVEMOUSE);
warning("%d: T3D_RECURSIONLEVEL1\n", flags & T3D_RECURSIONLEVEL1);
warning("%d: T3D_SKY\n", flags & T3D_SKY);
warning("%d: T3D_PRELOAD_RXT\n", flags & T3D_PRELOAD_RXT);
warning("%d: T3D_STATIC_SET0\n", flags & T3D_STATIC_SET0);
warning("%d: T3D_STATIC_SET1\n", flags & T3D_STATIC_SET1);
warning("%d: T3D_NOSHADOWS\n", flags & T3D_NOSHADOWS);
warning("%d: T3D_NOICONS\n", flags & T3D_NOICONS);
warning("%d: T3D_NOSOUND\n", flags & T3D_NOSOUND);
warning("%d: T3D_PRELOADBASE\n", flags & T3D_PRELOADBASE);
warning("%d: T3D_NOMUSIC\n", flags & T3D_NOMUSIC);
warning("%d: T3D_DEBUGMODE\n", flags & T3D_DEBUGMODE);
warning("%d: T3D_FASTFILE\n", flags & T3D_FASTFILE);
warning("%d: T3D_HIPOLYPLAYERS\n", flags & T3D_HIPOLYPLAYERS);
warning("%d: T3D_HIPOLYCHARACTERS\n", flags & T3D_HIPOLYCHARACTERS);
warning("%d: T3D_GENERATESHADOWMAPS", flags & T3D_GENERATESHADOWMAPS);
warning("%d: T3D_NOLIGHTMAPS", flags & T3D_NOLIGHTMAPS);
warning("%d: T3D_NORECURSION", flags & T3D_NORECURSION);
warning("%d: T3D_HALFTEXTURESIZE", flags & T3D_HALFTEXTURESIZE);
warning("%d: T3D_FULLSCREEN", flags & T3D_FULLSCREEN);
warning("%d: T3D_FASTRENDERING", flags & T3D_FASTRENDERING);
warning("%d: T3D_OUTDOORLIGHTS", flags & T3D_OUTDOORLIGHTS);
warning("%d: T3D_NOVOLUMETRICLIGHTS", flags & T3D_NOVOLUMETRICLIGHTS);
warning("%d: T3D_NOBOUNDS", flags & T3D_NOBOUNDS);
warning("%d: T3D_NOCAMERAS", flags & T3D_NOCAMERAS);
warning("%d: T3D_NONEXCLUSIVEMOUSE", flags & T3D_NONEXCLUSIVEMOUSE);
warning("%d: T3D_RECURSIONLEVEL1", flags & T3D_RECURSIONLEVEL1);
warning("%d: T3D_SKY", flags & T3D_SKY);
warning("%d: T3D_PRELOAD_RXT", flags & T3D_PRELOAD_RXT);
warning("%d: T3D_STATIC_SET0", flags & T3D_STATIC_SET0);
warning("%d: T3D_STATIC_SET1", flags & T3D_STATIC_SET1);
warning("%d: T3D_NOSHADOWS", flags & T3D_NOSHADOWS);
warning("%d: T3D_NOICONS", flags & T3D_NOICONS);
warning("%d: T3D_NOSOUND", flags & T3D_NOSOUND);
warning("%d: T3D_PRELOADBASE", flags & T3D_PRELOADBASE);
warning("%d: T3D_NOMUSIC", flags & T3D_NOMUSIC);
warning("%d: T3D_DEBUGMODE", flags & T3D_DEBUGMODE);
warning("%d: T3D_FASTFILE", flags & T3D_FASTFILE);
warning("%d: T3D_HIPOLYPLAYERS", flags & T3D_HIPOLYPLAYERS);
warning("%d: T3D_HIPOLYCHARACTERS", flags & T3D_HIPOLYCHARACTERS);
}
/* -----------------10/06/99 16.04-------------------
@ -190,7 +190,7 @@ Common::String constructPath(const Common::String &prefix, const Common::String
* t3dLoadSingleRoom
* --------------------------------------------------*/
t3dBODY *t3dLoadSingleRoom(WGame &game, const Common::String &_pname, t3dBODY *b, uint16 *NumBody, uint32 LoaderFlags) {
//warning("t3dLoadSingleRoom(workDirs, %s, b, %d, %d)\n", _pname, *NumBody, LoaderFlags);
//warning("t3dLoadSingleRoom(workDirs, %s, b, %d, %d)", _pname, *NumBody, LoaderFlags);
//decodeLoaderFlags(LoaderFlags);
Common::String pname(_pname);
@ -209,10 +209,10 @@ t3dBODY *t3dLoadSingleRoom(WGame &game, const Common::String &_pname, t3dBODY *b
auto name = constructPath(workdirs._t3dDir, pname);
//warning("t3dLoadSingleRoom opening(%s)\n", name.c_str());
//warning("t3dLoadSingleRoom opening(%s)", name.c_str());
auto stream = openFile(name);
if (!(stream)) { // Apre file
warning("t3dLoadSingleRoom: Failed to open(%s)\n", name.c_str());
warning("t3dLoadSingleRoom: Failed to open(%s)", name.c_str());
return nullptr;
}
@ -222,7 +222,7 @@ t3dBODY *t3dLoadSingleRoom(WGame &game, const Common::String &_pname, t3dBODY *b
} else
b = (t3dBODY *)t3dRealloc((uint32 *)b, sizeof(t3dBODY) * (++(*NumBody))); // Altrimenti, ridimensiona
//warning("Loading %s ...\n", name.c_str());
//warning("Loading %s ...", name.c_str());
*b = t3dBODY(); // Azzera Body
uint16 fileVersion = stream->readByte();
@ -254,7 +254,7 @@ t3dBODY *t3dLoadSingleRoom(WGame &game, const Common::String &_pname, t3dBODY *b
* t3dLoadRoom
* --------------------------------------------------*/
t3dBODY *t3dLoadRoom(WGame &game, const Common::String &pname, t3dBODY *b, uint16 *NumBody, uint32 LoaderFlags) {
warning("t3dLoadRoom(%s, b, %d, %d)\n", pname.c_str(), *NumBody, LoaderFlags);
warning("t3dLoadRoom(%s, b, %d, %d)", pname.c_str(), *NumBody, LoaderFlags);
struct _t3dLOADLIST *l;
t3dBODY *r, *rez;
t3dBODY *body;
@ -291,7 +291,7 @@ t3dBODY *t3dLoadRoom(WGame &game, const Common::String &pname, t3dBODY *b, uint1
t3dCalcRejectedMeshFromPortal(LoadedFiles[i].b);
}
warning("Room loaded\n");
warning("Room loaded");
return r;
}

4
engines/watchmaker/3d/material.cpp
View File

@ -27,7 +27,7 @@ namespace Watchmaker {
MaterialPtr rAddMaterial(gMaterial &Material, const Common::String &TextName, int NumFaces, unsigned int LoaderFlags) {
// TODO: This is duplicated in opengl_3d.cpp
warning("TODO: Fix rAddMaterial\n");
warning("TODO: Fix rAddMaterial");
#if 0
bool AlreadyLoaded=FALSE;
int len=strlen(TextName);
@ -237,7 +237,7 @@ void rRemoveMaterial(Common::SharedPtr<gMaterial> &m) {
* Aggiunge un materiale alla MaterialList
* --------------------------------------------------*/
void rAddToMaterialList(gMaterial &mat, signed short int ViewMatrixNum) {
//warning("Stubbed: rAddToMaterialList\n");
//warning("Stubbed: rAddToMaterialList");
//D3DVERTEXBUFFERDESC VBDesc;
gMaterial *cm;
gBatchBlock *bb;

2
engines/watchmaker/3d/math/Matrix4x4.h
View File

@ -48,7 +48,7 @@ struct Matrix4x4 {
for (int col = 1; col <= 4; col++) {
warning("%f ", getValue(row, col));
}
warning("\n");
warning("");
}
}
bool operator==(const Matrix4x4 &rhs) const {

2
engines/watchmaker/3d/math/llmath.cpp
View File

@ -26,7 +26,7 @@ namespace Watchmaker {
int32 t3dFloatToInt(t3dF32 nfloat) {
int32 sint = nfloat;
// warning("STUBBED: t3dFloatToInt\n");
// warning("STUBBED: t3dFloatToInt");
/*
__asm
{

2
engines/watchmaker/3d/movie.h
View File

@ -43,7 +43,7 @@ struct gMovie {
// TODO
~gMovie() {
//warning("TODO: Clean up gMovie properly\n");
//warning("TODO: Clean up gMovie properly");
}
};

2
engines/watchmaker/3d/render/opengl.cpp
View File

@ -29,7 +29,7 @@ bool rGetStencilBitDepth() {
#if 0
return gStencilBitDepth;
#endif
//warning("TODO: Implement rGetStencilBitDepth\n");
//warning("TODO: Implement rGetStencilBitDepth");
return false;
}

12
engines/watchmaker/3d/render/opengl_2d.cpp
View File

@ -118,7 +118,7 @@ void rResetExtends(void) {
void rBlitter(WGame &game, int dst, int src, int dposx, int dposy,
int sposx, int sposy, int sdimx, int sdimy) {
// TODO: This currently gets called a bit too much.
//warning("TODO: Stubbed rBlitter(%s, %d, %d, %d, %d, %d, %d, %d, %d)\n", gBitmapList[src].Name, dst, src, dposx, dposy, sposx, sposy, sdimx, sdimy);
//warning("TODO: Stubbed rBlitter(%s, %d, %d, %d, %d, %d, %d, %d, %d)", gBitmapList[src].Name, dst, src, dposx, dposy, sposx, sposy, sdimx, sdimy);
auto &bitmap = gBitmapList[src];
checkGlError("rBlitter Start");
@ -273,7 +273,7 @@ int createTextureFromSurface2(Surface &surface, int texFormat) {
compressed = false;
break;
default:
warning("Texture format not handled: %d\n", texFormat);
warning("Texture format not handled: %d", texFormat);
}
if (compressed) {
@ -288,14 +288,14 @@ int createTextureFromSurface2(Surface &surface, int texFormat) {
int rLoadBitmapImage(WGame &game, const char *TextName, unsigned char flags) {
WorkDirs &workDirs = game.workDirs;
if (flags & rTEXTURESURFACE) {
warning("TODO: support texture surface loading\n");
warning("TODO: support texture surface loading");
// return ((int) gLoadTexture(TextName, flags));
}
assert(TextName);
auto stream = workDirs.resolveFile(TextName);
if (!stream) {
warning("gLoadBitmapImage: Cannot find %s.\n", TextName);
warning("gLoadBitmapImage: Cannot find %s.", TextName);
return -1;
}
@ -303,7 +303,7 @@ int rLoadBitmapImage(WGame &game, const char *TextName, unsigned char flags) {
unsigned int pos = gGetBitmapListPosition();
if (pos == 0) {
warning("rLoadBitmap: Can't create more bitmaps\n");
warning("rLoadBitmap: Can't create more bitmaps");
return -1;
}
gTexture *Texture = &gBitmapList[pos];
@ -322,7 +322,7 @@ int rLoadBitmapImage(WGame &game, const char *TextName, unsigned char flags) {
if (flags & rSURFACESTRETCH) { // Also rSURFACEFLIP
static bool warned = false;
if (!warned) {
warning("TODO: rSURFACESTRETCH\n");
warning("TODO: rSURFACESTRETCH");
warned = true;
}
// HACK: Just set a dimension at all:

20
engines/watchmaker/3d/render/opengl_3d.cpp
View File

@ -109,7 +109,7 @@ void rAddLinesArray() {
//***********************************************************************************************
void *rLockPointArray() {
warning("TODO: Implement rLockPointArray\n");
warning("TODO: Implement rLockPointArray");
#if 0
HRESULT hResult;
LPVOID v;
@ -138,7 +138,7 @@ void rAddTrianglesArray(float x, float y, int r, int g, int b, int a) {
//***********************************************************************************************
void rUnlockPointArray() {
warning("TODO: Implement rUnlockPointArray\n");
warning("TODO: Implement rUnlockPointArray");
#if 0
g_lpD3DPointsBuffer->Unlock();
#endif
@ -272,10 +272,10 @@ int rAddUserViewMatrix(float _00, float _01, float _02,
rTempViewMatrix.setValue(4, 4, 1.0f);
auto &tmp = rTempViewMatrix;
//warning("Adding: \n");
//warning("Adding: ");
//tmp.print();
for (i = 0, um = &rUserViewMatrix[0]; i < rNumUserViewMatrices; i++, um++) {
//warning("Comparing %d\n", i);
//warning("Comparing %d", i);
//um->print();
if (*um == tmp) {
return i;
@ -423,7 +423,7 @@ void gBuildAlternateName(char *AltName, const char *Name) {
}
}
//warning("Build alternate name %s -> %s\n", Name, AltName);
//warning("Build alternate name %s -> %s", Name, AltName);
}
//*********************************************************************************************
@ -561,7 +561,7 @@ int createTextureFromSurface(Surface &surface, int texFormat) {
compressed = true;
break;
default:
warning("Texture format not handled: %d\n", texFormat);
warning("Texture format not handled: %d", texFormat);
}
#endif
if (compressed) {
@ -580,7 +580,7 @@ struct DDSHeader {
DDSHeader parseDDSHeader(Common::SeekableReadStream &stream) {
DDSHeader header;
//warning("TODO: Implement DDS Header parsing\n");
//warning("TODO: Implement DDS Header parsing");
uint32 retv = ' SDD'; //MAKEFOURCC( 'D','D','S',' ' );
uint32 magic = stream.readUint32LE();
if (magic != retv) {
@ -674,7 +674,7 @@ Common::SharedPtr<gMovie> gLoadMovie(WorkDirs &workDirs, const char *TextName) {
{
//create surface
//warning("TODO: Create compressed surface\n");
//warning("TODO: Create compressed surface");
#if 0
DDSURFACEDESC2 ddsd2;
@ -709,7 +709,7 @@ gTexture *gLoadTexture(WorkDirs &workDirs, const char *TextName, unsigned int Lo
if (!TextName) return nullptr;
lpSSource = nullptr;
//warning("gLoadTexture(%s)\n", TextName);
//warning("gLoadTexture(%s)", TextName);
// Check if already loaded
for (uint32 i = 0; i < gNumTextureList; i++) {
if (gTextureList[i].name.equalsIgnoreCase(TextName)) {
@ -935,7 +935,7 @@ MaterialPtr Renderer::addMaterial(MaterialPtr MList, const Common::String &name,
bool AlreadyLoaded = FALSE;
int len = name.size();
//warning("AddMaterial(%s)\n", name.c_str());
//warning("AddMaterial(%s)", name.c_str());
if (((name[len - 1 - 0] == 'i') || (name[len - 1 - 0] == 'I')) &&
((name[len - 1 - 1] == 'v') || (name[len - 1 - 1] == 'V')) &&
((name[len - 1 - 2] == 'a') || (name[len - 1 - 2] == 'A'))) {

6
engines/watchmaker/3d/render/opengl_renderer.cpp
View File

@ -64,7 +64,7 @@ void OpenGLRenderer::drawIndexedPrimitivesVBO(PrimitiveType primitiveType, Commo
for (int i = 0; i < numFaces; i++) {
int index = faces[i];
auto &vertex = VBO->_buffer[index];
//warning("%d/%d %d: [%f, %f, %f], [%f, %f], [%f, %f]\n", i, numFaces, index, vertex.x, vertex.y, vertex.z, vertex.u1, vertex.v1, vertex.u2, vertex.v2);
//warning("%d/%d %d: [%f, %f, %f], [%f, %f], [%f, %f]", i, numFaces, index, vertex.x, vertex.y, vertex.z, vertex.u1, vertex.v1, vertex.u2, vertex.v2);
//glColor3f((float)i/numFaces, 1.0, 0.0);
glColor3f(1.0f, 1.0f, 1.0f);
glTexCoord2f(vertex.u1, vertex.v1);
@ -91,7 +91,7 @@ void OpenGLRenderer::drawPrimitives(PrimitiveType primitiveType, Vertex *vertice
glFlush();
}
void OpenGLRenderer::drawIndexedPrimitivesVBO(PrimitiveType primitiveType, int VBO, int firstVertex, int numVertices, uint16 *faces, uint32 numFaces) {
//warning("TODO: Implement drawIndexedPrimitivesVBO\n");
//warning("TODO: Implement drawIndexedPrimitivesVBO");
}
@ -176,7 +176,7 @@ void OpenGLRenderer::setRenderState(RenderState state, int value) {
case RenderState::ALPHABLEND: setGlFeature(GL_BLEND, value); break; // TODO
}
//warning("TODO: Implement setRenderState\n");
//warning("TODO: Implement setRenderState");
}
GLenum translateBlendFactorToGL(BlendFactor factor) {

4
engines/watchmaker/3d/render/opengl_renderer.h
View File

@ -76,11 +76,11 @@ public:
void setRenderState(RenderState state, int value);
void setBlendFunc(BlendFactor src, BlendFactor dst);
bool error() const {
//warning("TODO: Implement error\n");
//warning("TODO: Implement error");
return false;
}
Common::String getErrorString() {
warning("TODO: Implement getErrorString\n");
warning("TODO: Implement getErrorString");
return "";
}
// TODO: This just maps to the D3D way to setting textures

10
engines/watchmaker/3d/render/render.cpp
View File

@ -128,7 +128,7 @@ void RenderGeometry(void) {
bool hres = false;
RenderSky();
//warning("TODO: Texture configuration\n");
//warning("TODO: Texture configuration");
#if 0
g_renderer->SetTextureStageState(0, D3DTSS_TEXCOORDINDEX, 0);
g_renderer->SetTextureStageState(1, D3DTSS_TEXCOORDINDEX, 1);
@ -165,7 +165,7 @@ void RenderGeometry(void) {
if ((g_renderer->supportsMultiTexturing()) && (bb->Texture2 != LastTexture2)) {
if (bb->Texture2 > 0) {
if (LastTexture2 <= 0) {
//warning("TODO: Texture configuration\n");
//warning("TODO: Texture configuration");
#if 0
g_renderer->SetTextureStageState(1, D3DTSS_COLOROP, D3DTOP_MODULATE);
g_renderer->SetTextureStageState(1, D3DTSS_COLORARG1, D3DTA_TEXTURE);
@ -177,7 +177,7 @@ void RenderGeometry(void) {
}
g_renderer->setTexture(1, gTextureList[bb->Texture2]);
} else if (LastTexture2 > 0) {
//warning("TODO: Texture configuration\n");
//warning("TODO: Texture configuration");
#if 0
g_renderer->SetTextureStageState(1, D3DTSS_COLOROP, D3DTOP_DISABLE);
g_renderer->SetTextureStageState(1, D3DTSS_ALPHAOP, D3DTOP_DISABLE);
@ -196,7 +196,7 @@ void RenderGeometry(void) {
}
bb->Texture1 = -3;
}
//warning("TODO: Texture configuration\n");
//warning("TODO: Texture configuration");
#if 0
g_renderer->SetTextureStageState(1, D3DTSS_COLOROP, D3DTOP_DISABLE);
g_renderer->SetTextureStageState(1, D3DTSS_ALPHAOP, D3DTOP_DISABLE);
@ -415,7 +415,7 @@ bool rRenderScene(void) {
SHADOWBOX *sb = ShadowBoxesList[j];
rSetUserViewMatrix(sb->ViewMatrixNum);
if (bDisableShadows) break;
warning("TODO: Shadows\n");
warning("TODO: Shadows");
#if 0
for (i = 0; i < sb->NumShadowsList; i++) {
if (!(hres = RenderProjectiveShadow(&sb->ShadowsList[i]))) {

16
engines/watchmaker/3d/render/shadows.cpp
View File

@ -151,7 +151,7 @@ void Find2DConvexHull(DWORD nverts, COLORVERTEX *pntptr, DWORD *cNumOutIdxs, WOR
* find 2D convex hull for the object
* --------------------------------------------------*/
bool rMakeShadowVolume(SHADOWBOX *sb, gVertex *InVerts, DWORD nverts, float lightm[9]) {
warning("Stubbed: rMakeShadowVolume\n");
warning("Stubbed: rMakeShadowVolume");
#if 0
Matrix4x4 matWorld, matView, matProj, IDmat;
DWORD i;
@ -319,7 +319,7 @@ bool rMakeShadowVolume(SHADOWBOX *sb, gVertex *InVerts, DWORD nverts, float ligh
* makes a shadow box to avoid stenciled shadows over the object
* --------------------------------------------------*/
bool rMakeShadowBox(SHADOWBOX *sb, float BoxX, float BoxY, float BoxZ, WORD intens) {
warning("Stubbed: rMakeShadowBox\n");
warning("Stubbed: rMakeShadowBox");
#if 0
bool hr;
LPDIRECT3DDEVICE7 pd3dDevice = g_pd3dDevice;
@ -509,7 +509,7 @@ bool rMakeShadowBox(SHADOWBOX *sb, float BoxX, float BoxY, float BoxZ, WORD inte
* --------------------------------------------------*/
bool RenderShadow(SHADOW *pShad,
void *lpVBuf) {
warning("TODO: Stubbed RenderShadow\n");
warning("TODO: Stubbed RenderShadow");
#if 0
LPDIRECT3DDEVICE7 pd3dDevice = g_pd3dDevice;
@ -583,7 +583,7 @@ bool RenderShadow(SHADOW *pShad,
* --------------------------------------------------*/
bool RenderShadowBox(SHADOWBOX *pSB,
int lpVBuf) {
warning("TODO: RenderShadowBox\n");
warning("TODO: RenderShadowBox");
#if 0
LPDIRECT3DDEVICE7 pd3dDevice = g_pd3dDevice;
@ -628,7 +628,7 @@ bool RenderShadowBox(SHADOWBOX *pSB,
* of rendered 2D extent rect of all shadow vols.
* --------------------------------------------------*/
bool DrawShadow(unsigned int x1, unsigned int y1, unsigned int x2, unsigned int y2, WORD intens) {
warning("Stubbed: DrawShadow\n");
warning("Stubbed: DrawShadow");
#if 0
LPDIRECT3DDEVICE7 pd3dDevice = g_pd3dDevice;
@ -698,7 +698,7 @@ bool DrawShadow(unsigned int x1, unsigned int y1, unsigned int x2, unsigned int
* prepare shadow for projection to a texture
* --------------------------------------------------*/
bool rMakeProjectiveShadow(SHADOWBOX *sb, void *InVerts, DWORD nverts) {
warning("Stubbed. rMakeProjectiveShadow\n");
warning("Stubbed. rMakeProjectiveShadow");
#if 0
SHADOW *shad = &sb->ShadowsList[0];
D3DVERTEXBUFFERDESC vbDesc;
@ -820,7 +820,7 @@ bool rMakeProjectiveShadow(SHADOWBOX *sb, void *InVerts, DWORD nverts) {
* renders shadow to a specific texture
* --------------------------------------------------*/
bool RenderProjectiveShadow(SHADOW *pShad) {
warning("Stubbed. RenderPojectiveShadow\n");
warning("Stubbed. RenderPojectiveShadow");
#if 0
HRESULT hres;
LPDIRECT3DDEVICE7 pd3dDevice = g_pd3dDevice;
@ -911,7 +911,7 @@ bool RenderProjectiveShadow(SHADOW *pShad) {
* draw projected shadow texture to the room
* --------------------------------------------------*/
bool DrawProjectiveShadow(SHADOW *pShad) {
warning("Stubbed: DrawProjectiveShadow\n");
warning("Stubbed: DrawProjectiveShadow");
#if 0
bool hres;

6
engines/watchmaker/3d/t3d_body.cpp
View File

@ -81,7 +81,7 @@ void t3dLoadMaterials(WGame &game, t3dBODY *b, Common::SeekableReadStream &strea
if (LoaderFlags & T3D_HALFTEXTURESIZE) flag = rSURFACEHALF; // Se deve scalare le textures
else flag = 0;
MaterialPtr mat = b->MatTable[material];
//warning("Loading material %d\n", material);
//warning("Loading material %d", material);
#ifndef WMGEN
if (!(game._renderer->addMaterial(mat, Appo,/*f1*/0, flag))) { // Carica e scala texture
warning("Material file %s not found, ", Appo); // Se non trova la texture
@ -269,7 +269,7 @@ void LoadBounds(WorkDirs &workDirs, const char *pname, t3dBODY *b) {
}
b->NumLevels = nlev = stream->readSint16LE();
if (nlev > T3D_MAX_LEVELS) {
warning("Too much Floor Levels in %s: %d instead of %d\n", pname, b->NumLevels, T3D_MAX_LEVELS);
warning("Too much Floor Levels in %s: %d instead of %d", pname, b->NumLevels, T3D_MAX_LEVELS);
b->NumLevels = nlev = T3D_MAX_LEVELS;
}
@ -537,7 +537,7 @@ t3dBODY *t3dBODY::loadFromStream(WGame &game, const Common::String &pname, Commo
#endif
//----------------END OF VERTEX PRE-LIGHTING---------------------
warning("LoaderFlags late = %08X\n", LoaderFlags);
warning("LoaderFlags late = %08X", LoaderFlags);
//decodeLoaderFlags(LoaderFlags);
if (!(LoaderFlags & T3D_NOBOUNDS)) { // Carica Bounds
auto bndName = workdirs.join(workdirs._bndDir, pname, "bnd");

2
engines/watchmaker/3d/t3d_mesh.cpp
View File

@ -40,7 +40,7 @@ void t3dMESH::loadFaces(t3dBODY *b, Common::SeekableReadStream &stream) {
uint16 n = stream.readSint16LE(); // Legge indice materiale
if (n >= b->NumMaterials())
warning("Material index wrong: current index: %d; Max material index %d\n", n, b->NumMaterials());
warning("Material index wrong: current index: %d; Max material index %d", n, b->NumMaterials());
else {
FList[face].mat = b->MatTable[n]; // Make the pointer to the material
if (b->MatTable[n]->addNumFaces(1/*f2*/) == false) // Add face space to the material

2
engines/watchmaker/classes/do_keyboard.cpp
View File

@ -248,7 +248,7 @@ void HandleFirstPersonView( void )
* --------------------------------------------------*/
void ProcessKeyboard(WGame &game) {
//warning("STUBBED: ProcessKeyboard\n");
//warning("STUBBED: ProcessKeyboard");
// Hack: Skip intro:
if ((CurDialog == dR000) || (CurDialog == dR111) || (CurDialog == dR211)) {

4
engines/watchmaker/classes/do_player.cpp
View File

@ -332,7 +332,7 @@ void UpdatePlayerStand(WGame &game, uint8 oc) {
mindist = dist;
na = b;
}
warning("Found %d, dist %f, good %d\n", b, dist, na);
warning("Found %d, dist %f, good %d", b, dist, na);
panims[pc] = b ;
pc ++;
@ -424,7 +424,7 @@ void ChangePlayer(WGame &game, uint8 oc) {
}
}
// Cambia stanza andandosi a leggere la posizione e l'animazione che aveva prima
warning("Changing Room to |%s| pos: %d an: %d\n", PlayerStand[CurPlayer].roomName.c_str(), PlayerStand[CurPlayer].pos, PlayerStand[CurPlayer].an);
warning("Changing Room to |%s| pos: %d an: %d", PlayerStand[CurPlayer].roomName.c_str(), PlayerStand[CurPlayer].pos, PlayerStand[CurPlayer].an);
ChangeRoom(game, PlayerStand[CurPlayer].roomName, PlayerStand[CurPlayer].pos, 0);
if ((curRoom == r15) || (curRoom == r1F))
SetBndLevel(init, nullptr, PlayerStand[CurPlayer].bnd);

2
engines/watchmaker/classes/do_sound.cpp
View File

@ -51,7 +51,7 @@ namespace Watchmaker {
* InitMusic
* --------------------------------------------------*/
bool InitMusic() {
warning("STUBBED InitMusic\n");
warning("STUBBED InitMusic");
#if 0
if (!mInitMusicSystem())
return false;

6
engines/watchmaker/classes/do_system.cpp
View File

@ -520,7 +520,7 @@ void PaintIntroText(Renderer &renderer) {
/* PROCESSTIME */
/*-------------------------------------------------------------------------*/
void ProcessTime(WGame &game) {
// warning("STUBBED ProcessTime\n");
// warning("STUBBED ProcessTime");
// LARGE_INTEGER pf,pt;
int32 i;
@ -665,7 +665,7 @@ void InitMain(WGame &game) {
Event(EventClass::MC_SYSTEM, ME_START, MP_DEFAULT, 0, 0, 0, nullptr, nullptr, nullptr);
if (!rClearBuffers(rCLEARBACKBUFFER | rCLEARZBUFFER)) // Cancella buffers
//warning("Unable to clear backbuffers\n");
//warning("Unable to clear backbuffers");
T1.tnum = T2.tnum = -1;
T1t = T2t = nullptr;
@ -925,7 +925,7 @@ void doSystem(WGame &game) {
case ME_CONTINUEEFFECT:
TheMessage->wparam1 --;
if (TheMessage->wparam1 > 0) {
warning("STUBBED: ME_CONTINUEEFFECT\n");
warning("STUBBED: ME_CONTINUEEFFECT");
#if 0
switch (TheMessage->bparam) {
case EFFECT_FADIN:

16
engines/watchmaker/game.cpp
View File

@ -114,7 +114,7 @@ const char *CharNameHI_Strings[] = {
* --------------------------------------------------*/
// Controllo che la giusta MoglieSupervisore sia caricata
bool WGame::CheckAndLoadMoglieSupervisoreModel(int32 c) {
warning("CheckAndLoadMoglieSupervisoreModel(workDirs, %d)\n", c);
warning("CheckAndLoadMoglieSupervisoreModel(workDirs, %d)", c);
char RemoveName[128] = "";
char RemoveNameHI[128] = "";
int32 j;
@ -289,7 +289,7 @@ int WGame::StartPlayingGame(const Common::String &LoaderName_override) {
bool WGame::LoadAndSetup(const Common::String &name, uint8 lite) {
uint16 i = 0;
warning("--=>> %s <<=--: LoaderFlags: %08X\n", name.c_str(), LoaderFlags);
warning("--=>> %s <<=--: LoaderFlags: %08X", name.c_str(), LoaderFlags);
t3dCurCamera = &t3dIconCamera;
auto windowInfo = _renderer->getScreenInfos();
@ -318,7 +318,7 @@ bool WGame::LoadAndSetup(const Common::String &name, uint8 lite) {
return false;
}
warning("Reached loop: %02X\n", LoadChar);
warning("Reached loop: %02X", LoadChar);
for (i = 0; i < 32; i++) {
if (i >= ocCURPLAYER) continue;
@ -341,7 +341,7 @@ bool WGame::LoadAndSetup(const Common::String &name, uint8 lite) {
CharNameHI_Strings[i + 1] = "MoglieKimono.t3d";
}
}
warning("About to load %s\n", CharName[i + 1]);
warning("About to load %s", CharName[i + 1]);
if (!(Character[i + 1] = t3dLoadCharacter(*this, CharName[i + 1], Character[i + 1], i))) {
warning("Error loading %s", CharName[i + 1]);
return false;
@ -540,7 +540,7 @@ void WGame::UpdateAll() {
*
* --------------------------------------------------*/
void WGame::LoadMisc() {
warning("LoadMisc\n");
warning("LoadMisc");
char str[20];
int32 i;
@ -606,7 +606,7 @@ void WGame::LoadMisc() {
}
bMiscLoaded = 1;
warning("LoadMisc Done\n");
warning("LoadMisc Done");
}
void WGame::GameLoop() {
@ -637,7 +637,7 @@ void WGame::GameLoop() {
sdl->pollSDL();
done = sdl->shouldQuit;
if (g_bActive && g_bReady) {
//warning("NextMessage\n");
//warning("NextMessage");
NextMessage(*this);
}
//}
@ -649,7 +649,7 @@ void WGame::CleanUpAndPostQuit() {
extern char *TextBucket;
gameOptions.save(workDirs);
warning("STUBBED CleanupAndPostQuit\n");
warning("STUBBED CleanupAndPostQuit");
#if 0
if (CreditsNames) t3dFree(CreditsNames);
if (CreditsRoles) t3dFree(CreditsRoles);

2
engines/watchmaker/game_options.h
View File

@ -55,7 +55,7 @@ public:
subtitles_on = stream->readByte();
bShowRoomDescriptions = stream->readByte();
bShowExtraLocalizationStrings = stream->readByte();
warning("Done loading options\n");
warning("Done loading options");
#endif
return true;
}

2
engines/watchmaker/globvar.h
View File

@ -48,7 +48,7 @@ struct Init : public SerializableAsset {
SerializableDynamicArray<SCreditsRole> _creditsRoles;
void loadFromStream(Common::SeekableReadStream &stream) {
warning("Init\n");
warning("Init");
Room.loadFromStream(stream);
Obj.loadFromStream(stream);
InvObj.loadFromStream(stream);

2
engines/watchmaker/ll/ll_mouse.cpp
View File

@ -153,7 +153,7 @@ void HandleMouseChanges()
bLPressed = buttonState & SDL_BUTTON_LMASK;
bRPressed = buttonState & SDL_BUTTON_RMASK;
//warning("L: %d %d R: %d %d\n", bLPressed, bLPressedPrev, bRPressed, bRPressedPrev);
//warning("L: %d %d R: %d %d", bLPressed, bLPressedPrev, bRPressed, bRPressedPrev);
// Button 0 pressed or released
if( bLPressed != bLPressedPrev )
{

4
engines/watchmaker/ll/ll_regen.cpp
View File

@ -239,7 +239,7 @@ void ResetScreenBuffer() {
memset(OldPaintRect, 0, sizeof(OldPaintRect));
if (!rClearBuffers(rCLEARSCREENBUFFER | rCLEARZBUFFER))
warning("Unable to clear screenbuffer\n");
warning("Unable to clear screenbuffer");
}
/* -----------------30/10/98 16.18-------------------
@ -262,7 +262,7 @@ void AddPaintRect(int32 tnum, int32 px, int32 py, int32 ox, int32 oy, int32 dx,
// ce ne sono troppe
if (a >= MAX_PAINT_RECTS) {
warning("Too many PaintRects!\n");
warning("Too many PaintRects!");
return ;
}

30
engines/watchmaker/ll/ll_sound.cpp
View File

@ -25,77 +25,77 @@
namespace Watchmaker {
bool mInitMusicSystem(void) {
warning("STUBBED: mInitMusicSystem\n");
warning("STUBBED: mInitMusicSystem");
return true;
}
bool mCloseMusicSystem(void) {
warning("STUBBED: mCloseMusicSystem\n");
warning("STUBBED: mCloseMusicSystem");
return true;
}
bool mLoadMusic(const char *FileName) {
warning("STUBBED: mLoadMusic\n");
warning("STUBBED: mLoadMusic");
return true;
}
bool mPlayMusic(const char *FileName) {
warning("STUBBED: mPlayMusic\n");
warning("STUBBED: mPlayMusic");
return true;
}
bool mStopMusic(void) {
warning("STUBBED: mStopMusic\n");
warning("STUBBED: mStopMusic");
return true;
}
bool mRestoreMixerVolume(void) {
warning("STUBBED: mRestoreMixerVolume\n");
warning("STUBBED: mRestoreMixerVolume");
return true;
}
bool sSetListener(sListener *NewListener) {
warning("STUBBED: sSetListener\n");
warning("STUBBED: sSetListener");
return true;
}
bool sStartSound(sSound *CurSound, bool Reload) {
warning("STUBBED: sStartSound\n");
warning("STUBBED: sStartSound");
return true;
}
bool sStopSound(int32 index) {
warning("STUBBED: sStopSound\n");
warning("STUBBED: sStopSound");
return true;
}
bool sStopAllSounds(void) {
warning("STUBBED: sStopAllSounds\n");
warning("STUBBED: sStopAllSounds");
return true;
}
bool sIsPlaying(sS32 lIndex) {
warning("STUBBED: sIsPlaying\n");
warning("STUBBED: sIsPlaying");
return true;
}
bool mSetAllVolume(unsigned char Volume) {
warning("STUBBED: mSetAllVolume\n");
warning("STUBBED: mSetAllVolume");
return true;
}
bool sSetAllSoundsVolume(unsigned char Vol) {
warning("STUBBED: sSetAllSoundsVolume\n");
warning("STUBBED: sSetAllSoundsVolume");
return true;
}
bool sSetAllSpeechVolume(unsigned char Vol) {
warning("STUBBED: sSetAllSpeechVolume\n");
warning("STUBBED: sSetAllSpeechVolume");
return true;
}
bool sStartSoundDiffuse(sSound *CurSound) {
warning("STUBBED: sStartSoundDiffuse\n");
warning("STUBBED: sStartSoundDiffuse");
return true;
}

10
engines/watchmaker/ll/ll_system.cpp
View File

@ -89,7 +89,7 @@ void *t3dRealloc(void *pp, uint32 additionalBytes) {
t3dAllocatedMemory += additionalBytes;
//malloc_size()
pp = res;//realloc(pp, additionalBytes);
//warning("t3dRealloc() size: %d, additionalBytes: %d, newSize = %d\n", size, additionalBytes, malloc_size(pp));
//warning("t3dRealloc() size: %d, additionalBytes: %d, newSize = %d", size, additionalBytes, malloc_size(pp));
return (pp);
}
@ -106,7 +106,7 @@ void t3dFree(void *p) {
//..........................................................................
void t3dStartTime() {
warning("STUBBED t3dStartTime\n");
warning("STUBBED t3dStartTime");
#if 0
timeGetDevCaps(&tc, sizeof(tc));
timeBeginPeriod(tc.wPeriodMin);
@ -115,7 +115,7 @@ void t3dStartTime() {
}
void t3dEndTime() {
warning("STUBBED t3dEndTime\n");
warning("STUBBED t3dEndTime");
#if 0
timeEndPeriod(tc.wPeriodMin);
#endif
@ -129,7 +129,7 @@ uint32 t3dReadTime() {
//------------------------- File I/O Functions -----------------------------
bool t3dFastFileInit(const char *name) {
warning("STUBBED t3dFastFileInit\n");
warning("STUBBED t3dFastFileInit");
#if 0
bUsingFastFile = FastFileInit(name);
return (BOOL)(bUsingFastFile);
@ -165,7 +165,7 @@ int t3dAccessFile(char *name) {
bool t3dGetFileDate(uint32 *date, uint32 *time, const char *name) {
#if 0
FILE *f = fopen(name, "rb");
//warning("STUBBED: t3dGetFileDate(%s)\n", name);
//warning("STUBBED: t3dGetFileDate(%s)", name);
if (f) {
fclose(f);
return true;

16
engines/watchmaker/ll/ll_util.cpp
View File

@ -253,7 +253,7 @@ int32 CreateTooltipBitmap(Renderer &renderer, char *tooltip, struct SFont *f, ui
* LoadFont
* --------------------------------------------------*/
void LoadFont(struct SFont *f, const char *n) {
warning("STUBBED: LoadFont(%s)\n", n);
warning("STUBBED: LoadFont(%s)", n);
#if 0
char name[100], a;
@ -288,7 +288,7 @@ int32 LoadDDBitmap(WGame &game, const char *n, uint8 flags) {
int rez = rLoadBitmapImage(game, name.c_str(), (uint8)(rBITMAPSURFACE | rSURFACEFLIP | flags));
if (rez <= 0) {
warning("Failed to load %s. Quitting ...\n", name.c_str());
warning("Failed to load %s. Quitting ...", name.c_str());
CloseSys(game);
}
@ -505,7 +505,7 @@ bool SetBndLevel(Init &init, const char *roomname, int32 lev) {
* PrintLoading
* --------------------------------------------------*/
void PrintLoading(void) {
warning("STUBBED: PrintLoading\n");
warning("STUBBED: PrintLoading");
#if 0
// Stampa la scritta loading
@ -654,7 +654,7 @@ void DisplayD3DTriangle(Renderer &renderer, int32 x1, int32 y1, int32 x2, int32
}
if (a >= MAX_D3D_TRIANGLES) {
warning("Too many D3D Triangles!\n");
warning("Too many D3D Triangles!");
return ;
}
@ -686,7 +686,7 @@ void DisplayD3DRect(Renderer &renderer, int32 px, int32 py, int32 dx, int32 dy,
}
if (a >= MAX_D3D_RECTS) {
warning("Too many D3D Rects!\n");
warning("Too many D3D Rects!");
return ;
}
@ -711,7 +711,7 @@ void DisplayDDBitmap(Renderer &renderer, int32 tnum, int32 px, int32 py, int32 o
break;
if (a >= MAX_DD_BITMAPS) {
warning("Too many DD Bitmaps!\n");
warning("Too many DD Bitmaps!");
return ;
}
@ -736,7 +736,7 @@ void DisplayDDBitmap_NoFit(int32 tnum, int32 px, int32 py, int32 ox, int32 oy, i
break;
if (a >= MAX_DD_BITMAPS) {
warning("Too many DD Bitmaps!\n");
warning("Too many DD Bitmaps!");
return ;
}
@ -799,7 +799,7 @@ void DisplayDDText(Renderer &renderer, char *text, struct SFont *f, uint8 color,
break;
if (a >= MAX_DD_TEXTS) {
warning("Too many DD Texts!\n");
warning("Too many DD Texts!");
return ;
}

6
engines/watchmaker/main.cpp
View File

@ -49,7 +49,7 @@ uint8 force_debug_window = 0;
void CleanUpAndPostQuit(WorkDirs &workDirs, GameOptions &gameOptions);
int WMakerMain() {
warning("The Watchmaker\n");
warning("The Watchmaker");
//CreateWindow()
int loaderFlags = 0;
@ -97,7 +97,7 @@ int WMakerMain() {
if (LoaderFlags & T3D_NOLIGHTMAPS) rSetLightmapRendering(0); // Disattiva le Lightmaps
else rSetLightmapRendering(1); // Attiva le Lightmaps
*/
warning("init engine...\n");
warning("init engine...");
if (!(rInitialize3DEnvironment(*game,/*hWnd, */ WmCfgName))) { // Apre scheda 3D
game->CleanUpAndPostQuit();
return 1;
@ -128,7 +128,7 @@ int WMakerMain() {
game->GameLoop();
warning("FIN\n");
warning("FIN");
delete game;
return 0;
}

48
engines/watchmaker/render.cpp
View File

@ -40,7 +40,7 @@
namespace Watchmaker {
bool rInitialize3DEnvironment(WGame &game, char *cfg) {
warning("STUBBED: rInitialize3DEnvironment\n");
warning("STUBBED: rInitialize3DEnvironment");
game.sdl->initWindow();
game._renderer->initGL();
return true;
@ -66,7 +66,7 @@ unsigned int gGetTextureListPosition() {
#endif
bool rSetRenderMode(int state) {
warning("STUBBED: rSetRenderMode\n");
warning("STUBBED: rSetRenderMode");
}
bool checkGlError(const char *when) {
@ -83,7 +83,7 @@ bool checkGlError(const char *when) {
case GL_STACK_OVERFLOW: explanation = "GL_STACK_OVERFLOW"; break;
default: break;
}
warning("%s: GL raised error %d - %s\n", when, error, explanation.c_str());
warning("%s: GL raised error %d - %s", when, error, explanation.c_str());
return false;
}
return true;
@ -103,41 +103,41 @@ bool rClearBuffers(char flags) {
}
unsigned char *rLockSurfaceDirect(gTexture *t, unsigned int *pitch) {
warning("STUBBED: rLockSurfaceDirect\n");
warning("STUBBED: rLockSurfaceDirect");
return nullptr;
}
void rUnlockSurfaceDirect(gTexture *t) {
warning("STUBBED: rUnlockSurfaceDirect\n");
warning("STUBBED: rUnlockSurfaceDirect");
}
uint16 rRGBAToTextureFormat(unsigned int r, unsigned int g, unsigned int b, unsigned int a) {
warning("STUBBED: rRGBAToTextureFormat\n");
warning("STUBBED: rRGBAToTextureFormat");
return 0;
}
bool rSetMovieFrame(MaterialPtr mat, uint32 dwCurrFrame) {
warning("STUBBED: rSetMovieFrame\n");
warning("STUBBED: rSetMovieFrame");
return false;
}
int rCreateSurface(unsigned int dimx, unsigned int dimy, unsigned char flags) {
warning("STUBBED: rCreateSurface\n");
warning("STUBBED: rCreateSurface");
return 0;
}
VertexBuffer rCreateVertexBuffer(unsigned int num) {
//warning("STUBBED: rCreateVertexBuffer\n");
//warning("STUBBED: rCreateVertexBuffer");
return VertexBuffer();
}
bool rDeleteVertexBuffer(VertexBuffer &vb) {
warning("STUBBED: rDeleteVertexBuffer\n");
warning("STUBBED: rDeleteVertexBuffer");
return false;
}
void rGetScreenInfos(unsigned int *width, unsigned int *height, unsigned int *bpp) {
warning("STUBBED: rGetScreenInfos\n");
warning("STUBBED: rGetScreenInfos");
*width = 800;
*height = 600;
*bpp = 32;
@ -157,7 +157,7 @@ bool rSetProjectionMatrix(float width, float height, float fAspect,
void rScreenSpaceToCameraSpace(float *dx, float *dy, float *dz, float x, float y) {
//warning("STUBBED: rScreenSpaceToCameraSpace\n");
//warning("STUBBED: rScreenSpaceToCameraSpace");
#if 0
D3DMATRIX m;
D3DVECTOR v, d;
@ -179,64 +179,64 @@ void rScreenSpaceToCameraSpace(float *dx, float *dy, float *dz, float x, float y
}
gTexture *gLoadTexture(char *TextName, unsigned int LoaderFlags) {
warning("STUBBED gLoadTexture\n");
warning("STUBBED gLoadTexture");
return nullptr;
}
bool rGrabVideo(const char *path, char flags) {
warning("STUBBED: rGrabVideo\n");
warning("STUBBED: rGrabVideo");
return true;
}
void rReleaseAllBitmaps(unsigned int NotFlags) {
warning("STUBBED: rReleaseAllBitmaps\n");
warning("STUBBED: rReleaseAllBitmaps");
return;
}
void rReleaseBitmap(int i) {
warning("STUBBED: rReleaseBitmap\n");
warning("STUBBED: rReleaseBitmap");
return;
}
void rReleaseAllTextures(unsigned int NotFlags) {
warning("STUBBED: rReleaseAllTextures\n");
warning("STUBBED: rReleaseAllTextures");
return;
}
void rSetBitmapName(unsigned int id, const char *s) {
warning("STUBBED: rSetBitmapName\n");
warning("STUBBED: rSetBitmapName");
return;
}
uint32 rGetMovieFrame(MaterialPtr mat) {
warning("STUBBED: rGetMovieFrame\n");
warning("STUBBED: rGetMovieFrame");
return 0;
}
void rPrintText(const char *s, unsigned int dst, unsigned int src, unsigned short *FontTable, unsigned short x, unsigned short y) {
warning("STUBBED: rPrintText\n");
warning("STUBBED: rPrintText");
return;
}
void rGetTextDim(const char *s, unsigned short *FontTable, int *x, int *y) {
warning("STUBBED: rGetTextDim\n");
warning("STUBBED: rGetTextDim");
return;
}
void rResetPipeline() {
//warning("STUBBED: rResetPipeline\n");
//warning("STUBBED: rResetPipeline");
return;
}
void rClear(int dst, int dposx, int dposy, int sdimx, int sdimy, unsigned char r, unsigned char g, unsigned char b) {
//warning("STUBBED: rClear(%d, %d, %d, %d, %d\n", dst, dposx, dposy, sdimx, sdimy);
//warning("STUBBED: rClear(%d, %d, %d, %d, %d", dst, dposx, dposy, sdimx, sdimy);
}
void rBlitScreenBuffer(void) { // Should probably go to opengl_2d
//warning("STUBBED: rBlitScreenBuffer\n");
//warning("STUBBED: rBlitScreenBuffer");
}
bool gMovie_SetFrame(gMaterial *mat, WORD newFrame) {

2
engines/watchmaker/renderer.cpp
View File

@ -92,7 +92,7 @@ bool Renderer::createScreenBuffer() {
_viewport.left = _viewport.top = 0;
_viewport.right = 800;
_viewport.bottom = 600;
warning("TODO: Implement createScreenBuffer\n");
warning("TODO: Implement createScreenBuffer");
return false;
}

2
engines/watchmaker/saveload.cpp
View File

@ -119,7 +119,7 @@ void loadAll(WorkDirs &workDirs, Init &init) {
// NOTA: se slot==255 forza il save (salva senza controllare le condizioni)
bool DataSave(const char *SaveName, uint8 slot) {
char str[T3D_NAMELEN];
warning("STUBBED: DataSave\n");
warning("STUBBED: DataSave");
#if 0
FILE *fhs;
int32 i, j;

14
engines/watchmaker/schedule.cpp
View File

@ -140,7 +140,7 @@ void Event(EventClass classe, uint8 event, uint16 flags, int16 wparam1, int16 wp
pqueue *lq;
message *lm;
warning("Event(%s, event=%d, flags=%d, wparam1=%d, wparam2=%d, bparam=%d\n", eventToString(classe), event, flags, wparam1, wparam2);
warning("Event(%s, event=%d, flags=%d, wparam1=%d, wparam2=%d, bparam=%d", eventToString(classe), event, flags, wparam1, wparam2);
if (classe == EventClass::MC_IDLE && !event)
return ;
@ -168,9 +168,9 @@ void Event(EventClass classe, uint8 event, uint16 flags, int16 wparam1, int16 wp
return;
} else {
for (a = 0; a < MAXWAITINGMSGS; a++)
warning("%d: %d %d %d %d\n", a, WaitingMsg[a].classe, WaitingMsg[a].event, WaitingMsg[a].flags, WaitingMsg[a].lparam[1]);
warning("%d: %d %d %d %d", a, WaitingMsg[a].classe, WaitingMsg[a].event, WaitingMsg[a].flags, WaitingMsg[a].lparam[1]);
warning("ERRORE! CODA WAITING PIENA! - messy %d %d MAX %d\n", classe, event, MAXWAITINGMSGS);
warning("ERRORE! CODA WAITING PIENA! - messy %d %d MAX %d", classe, event, MAXWAITINGMSGS);
return;
}
}
@ -179,9 +179,9 @@ void Event(EventClass classe, uint8 event, uint16 flags, int16 wparam1, int16 wp
uint8 pos;
for (pos = lq->head; pos != lq->tail; pos = (pos == MAX_MESSAGES - 1) ? 0 : pos + 1)
warning("EVENT %d %d\n", lq->event[pos]->classe, lq->event[pos]->event);
warning("EVENT %d %d", lq->event[pos]->classe, lq->event[pos]->event);
warning("ERRORE! CODA GAME PIENA! - messy %d %d MAX %d\n", classe, event, MAX_MESSAGES);
warning("ERRORE! CODA GAME PIENA! - messy %d %d MAX %d", classe, event, MAX_MESSAGES);
return;
}
@ -224,7 +224,7 @@ void Scheduler() {
Counter = 0;
TheMessage = &idlemessage;
}
//warning("Scheduler: %s %d\n", eventToString(TheMessage->classe), TheMessage->event);
//warning("Scheduler: %s %d", eventToString(TheMessage->classe), TheMessage->event);
}
/* -----------------08/02/99 10.11-------------------
@ -232,7 +232,7 @@ void Scheduler() {
* --------------------------------------------------*/
void ProcessTheMessage(WGame &game) {
SUPEREVENT:
//warning("Event: %s - %d\n", eventToString(TheMessage->classe), TheMessage->event);
//warning("Event: %s - %d", eventToString(TheMessage->classe), TheMessage->event);
switch (TheMessage->classe) {
case EventClass::MC_IDLE:
break;

10
engines/watchmaker/sdl_wrapper.cpp
View File

@ -63,7 +63,7 @@ void sdl_wrapper::pollSDL() {
switch (event.button.button) {
case SDL_BUTTON_LEFT:
bLPressed = true;
warning("LEFT PRESSED\n");
warning("LEFT PRESSED");
break;
case SDL_BUTTON_RIGHT:
bRPressed = true;
@ -76,7 +76,7 @@ void sdl_wrapper::pollSDL() {
switch (event.button.button) {
case SDL_BUTTON_LEFT:
bLPressed = false;
warning("LEFT RELEASED\n");
warning("LEFT RELEASED");
break;
case SDL_BUTTON_RIGHT:
bRPressed = false;
@ -104,7 +104,7 @@ void sdl_wrapper::initWindow() {
window = SDL_CreateWindow("The Watchmaker", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, 800, 600, SDL_WINDOW_OPENGL);
if (window == nullptr) {
warning("Couldn't create window: %s\n", SDL_GetError());
warning("Couldn't create window: %s", SDL_GetError());
assert(false);
}
int numRenderers = SDL_GetNumRenderDrivers();
@ -112,7 +112,7 @@ void sdl_wrapper::initWindow() {
for (int i = 0; i < numRenderers; i++) {
SDL_RendererInfo info;
SDL_GetRenderDriverInfo(i, &info);
warning("Renderer(%d): %s\n", i, info.name);
warning("Renderer(%d): %s", i, info.name);
if (strcmp(info.name, "opengl") == 0) {
renderIndex = i;
}
@ -120,7 +120,7 @@ void sdl_wrapper::initWindow() {
renderer = SDL_CreateRenderer(window, renderIndex, SDL_RENDERER_ACCELERATED);
SDL_RendererInfo info;
SDL_GetRendererInfo(renderer, &info);
warning("Renderer: %s\n", info.name);
warning("Renderer: %s", info.name);
IMG_Init(0);
#endif
}

4
engines/watchmaker/t2d/t2d.cpp
View File

@ -5448,7 +5448,7 @@ void CaricaSaves(WGame &game) {
char GfxFile[MAX_PATH];
char Temp[10];
char Data[T3D_NAMELEN + 8];
warning("STUBBED: CaricaSaves\n");
warning("STUBBED: CaricaSaves");
#if 0
FILE *file;
@ -5508,7 +5508,7 @@ void CaricaSaves(WGame &game) {
}
void SortSaves(void) {
warning("STUBBED: SortSaves\n");
warning("STUBBED: SortSaves");
#if 0
qsort(Saves, NSaves, sizeof(SavesS), CompareSaves);
#endif

2
engines/watchmaker/tga_util.cpp
View File

@ -115,7 +115,7 @@ unsigned int TGAread(void *ptr, unsigned int size, unsigned int n, Common::Seeka
unsigned int len = size * n;
#if 0
if ((!ptr) || (!len) || (/*stream.pos() > stream.size()*/)) {
warning("Overrun TGA parsing\n");
warning("Overrun TGA parsing");
return 0;
}
#endif

4
engines/watchmaker/walk/ball.cpp
View File

@ -285,7 +285,7 @@ void UpdateBall(WGame &game, struct SPhys *p) {
* ProcessGopherKeyboard
* --------------------------------------------------*/
void ProcessGopherKeyboard() {
warning("Stubbed: ProcessGopherKeyboard\n");
warning("Stubbed: ProcessGopherKeyboard");
#if 0
t3dF32 AngleX, AngleY, AngleSpeed;
t3dF32 TurnSpeed, Speed = 1.0f;
@ -410,7 +410,7 @@ void ProcessGopherKeyboard() {
* UpdateArrow
* --------------------------------------------------*/
void UpdateArrow() {
warning("Stubbed: UpdateArrow\n");
warning("Stubbed: UpdateArrow");
#if 0
t3dF32 AngleX, AngleY, AngleSpeed;
t3dM3X3F mx, mv;

6
engines/watchmaker/windows_hacks.cpp
View File

@ -26,7 +26,7 @@
namespace Watchmaker {
void ResetDIKbd(void) {
warning("STUBBED ResetDIKbd\n");
warning("STUBBED ResetDIKbd");
}
uint32 timeGetTime() {
@ -34,12 +34,12 @@ uint32 timeGetTime() {
}
void GetLocalTime(SYSTEMTIME *) {
warning("STUBBED GetLocalTime\n");
warning("STUBBED GetLocalTime");
return;
}
void CopyFile(char *, char *, bool) {
warning("STUBBED CopyFile\n");
warning("STUBBED CopyFile");
}
} // End of namespace Watchmaker

2
engines/watchmaker/work_dirs.cpp
View File

@ -36,7 +36,7 @@ Common::SharedPtr<Common::SeekableReadStream> WorkDirs::resolveFile(const Common
}
Common::String converted = convertedFilename;
delete[] convertedFilename;
//warning("Resolve: %s\n", path);
//warning("Resolve: %s", path);
Common::SharedPtr<Common::SeekableReadStream> stream = nullptr;
if (!noFastFile) {
stream = _fastFile->resolve(converted.c_str());