[Scummvm-git-logs] scummvm master -> d8e5994d32f6fa927cd2f5421b6f065375eb8481

dreammaster dreammaster at scummvm.org
Fri Jul 14 05:43:01 CEST 2017


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
d8e5994d32 SLUDGE: Fix Visual Studio compilation


Commit: d8e5994d32f6fa927cd2f5421b6f065375eb8481
    https://github.com/scummvm/scummvm/commit/d8e5994d32f6fa927cd2f5421b6f065375eb8481
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-07-13T23:42:41-04:00

Commit Message:
SLUDGE: Fix Visual Studio compilation

Changed paths:
    engines/sludge/loadsave.cpp
    engines/sludge/sprbanks.cpp
    engines/sludge/zbuffer.cpp


diff --git a/engines/sludge/loadsave.cpp b/engines/sludge/loadsave.cpp
index 72b1a9a..3ab1b13 100644
--- a/engines/sludge/loadsave.cpp
+++ b/engines/sludge/loadsave.cpp
@@ -54,7 +54,7 @@ namespace Sludge {
 //----------------------------------------------------------------------
 
 extern loadedFunction *allRunningFunctions;         // In sludger.cpp
-extern char *typeName[];                            // In variable.cpp
+extern const char *typeName[];                      // In variable.cpp
 extern int numGlobals;                              // In sludger.cpp
 extern variable *globalVars;                        // In sludger.cpp
 extern flor *currentFloor;                          // In floor.cpp
@@ -62,7 +62,8 @@ extern zBufferData zBuffer;                         // In zbuffer.cpp
 extern speechStruct *speech;                        // In talk.cpp
 extern personaAnimation *mouseCursorAnim;           // In cursor.cpp
 extern int mouseCursorFrameNum;                     // "    "   "
-extern int loadedFontNum, fontHeight, fontTableSize;    // In fonttext.cpp
+extern int loadedFontNum, fontHeight;				// In fonttext.cpp
+extern uint fontTableSize;							// 
 extern int numFontColours;                          // "    "   "
 extern UTF8Converter fontOrder;                       // "    "   "
 extern FILETIME fileTime;                           // In sludger.cpp
diff --git a/engines/sludge/sprbanks.cpp b/engines/sludge/sprbanks.cpp
index 594ea56..7c8ee13 100644
--- a/engines/sludge/sprbanks.cpp
+++ b/engines/sludge/sprbanks.cpp
@@ -32,7 +32,8 @@ namespace Sludge {
 
 loadedSpriteBank *allLoadedBanks = NULL;
 extern spriteBank theFont;
-extern int loadedFontNum, fontTableSize;
+extern int loadedFontNum;
+extern uint fontTableSize;
 
 loadedSpriteBank *loadBankForAnim(int ID) {
 	loadedSpriteBank *returnMe = allLoadedBanks;
diff --git a/engines/sludge/zbuffer.cpp b/engines/sludge/zbuffer.cpp
index 97c44e8..6ee8f7a 100644
--- a/engines/sludge/zbuffer.cpp
+++ b/engines/sludge/zbuffer.cpp
@@ -37,7 +37,7 @@ namespace Sludge {
 
 int zBufferToSet = -1;
 zBufferData zBuffer;
-extern int sceneWidth, sceneHeight;
+extern uint sceneWidth, sceneHeight;
 extern Graphics::Surface backdropSurface;
 extern Graphics::Surface renderSurface;
 





More information about the Scummvm-git-logs mailing list