HOPKINS: Standardize the use of g_PTRNUL

scummvm · Apr 3, 2013 · 177df08 · 177df08
1 parent b22a9b1
commit 177df08
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 19 deletions.
diff --git a/engines/hopkins/computer.cpp b/engines/hopkins/computer.cpp
@@ -44,9 +44,9 @@ ComputerManager::ComputerManager(HopkinsEngine *vm) {
 		memset(_menuText[i]._line, 0, 90);
 	}
 	Common::fill(&_inputBuf[0], &_inputBuf[200], '\0');
-	_breakoutSpr = NULL;
+	_breakoutSpr = g_PTRNUL;
 	_textColor = 0;
-	_breakoutLevel = NULL;
+	_breakoutLevel = (int16 *)g_PTRNUL;
 	_breakoutBrickNbr = 0;
 	_breakoutScore = 0;
 	_breakoutLives = 0;

diff --git a/engines/hopkins/events.cpp b/engines/hopkins/events.cpp
@@ -44,7 +44,7 @@ EventsManager::EventsManager(HopkinsEngine *vm) {
 	_mouseSpriteId = 0;
 	_curMouseButton = 0;
 	_mouseButton = 0;
-	_mouseCursor = NULL;
+	_mouseCursor = g_PTRNUL;
 	_gameCounter = 0;
 	_rateCounter = 0;
 	_escKeyFl = false;

diff --git a/engines/hopkins/globals.cpp b/engines/hopkins/globals.cpp
@@ -113,11 +113,11 @@ Globals::Globals(HopkinsEngine *vm) {
 	_oceanDirection = DIR_NONE;
 
 	// Initialize pointers
-	_levelSpriteBuf = NULL;
-	_saveData = NULL;
+	_levelSpriteBuf = g_PTRNUL;
+	_saveData = (Savegame *)g_PTRNUL;
 	_answerBuffer = g_PTRNUL;
-	_characterSpriteBuf = NULL;
-	_optionDialogSpr = NULL;
+	_characterSpriteBuf = g_PTRNUL;
+	_optionDialogSpr = g_PTRNUL;
 
 	// Reset flags
 	_censorshipFl = false;

diff --git a/engines/hopkins/graphics.cpp b/engines/hopkins/graphics.cpp
@@ -42,15 +42,15 @@ GraphicsManager::GraphicsManager(HopkinsEngine *vm) {
 	_initGraphicsFl = false;
 	_screenWidth = _screenHeight = 0;
 	_screenLineSize = 0;
-	PAL_PIXELS = NULL;
+	PAL_PIXELS = g_PTRNUL;
 	_lineNbr = 0;
 	_videoPtr = NULL;
 	_scrollOffset = 0;
 	_scrollPosX = 0;
 	_largeScreenFl = false;
 	_oldScrollPosX = 0;
-	_backBuffer = NULL;
-	_frontBuffer = NULL;
+	_backBuffer = g_PTRNUL;
+	_frontBuffer = g_PTRNUL;
 	_screenBuffer = g_PTRNUL;
 	_backupScreen = g_PTRNUL;
 	_showDirtyRects = false;

diff --git a/engines/hopkins/menu.cpp b/engines/hopkins/menu.cpp
@@ -44,7 +44,7 @@ MenuManager::MenuManager(HopkinsEngine *vm) {
 }
 
 int MenuManager::menu() {
-	byte *spriteData = NULL;
+	byte *spriteData = g_PTRNUL;
 	MenuSelection menuIndex;
 	Common::Point mousePos;
 	signed int result;

diff --git a/engines/hopkins/objects.cpp b/engines/hopkins/objects.cpp
@@ -101,10 +101,10 @@ ObjectsManager::ObjectsManager(HopkinsEngine *vm) {
 	_curObjectIndex = 0;
 	_forestFl = false;
 	_mapCarPosX = _mapCarPosY = 0;
-	_forestSprite = NULL;
-	_gestureBuf = NULL;
+	_forestSprite = g_PTRNUL;
+	_gestureBuf = g_PTRNUL;
 	_curGestureFile = 0;
-	_headSprites = NULL;
+	_headSprites = g_PTRNUL;
 	_homeRateCounter = 0;
 	_lastDirection = DIR_NONE;
 	_oldDirection = DIR_NONE;
@@ -193,7 +193,7 @@ void ObjectsManager::changeObject(int objIndex) {
 }
 
 byte *ObjectsManager::loadObjectFromFile(int objIndex, bool mode) {
-	byte *dataP = NULL;
+	byte *dataP = g_PTRNUL;
 	int objectFileNum = _objectAuthIcons[objIndex]._objectFileNum;
 	int idx = _objectAuthIcons[objIndex]._idx;
 

diff --git a/engines/hopkins/talk.cpp b/engines/hopkins/talk.cpp
@@ -37,10 +37,10 @@ namespace Hopkins {
 
 TalkManager::TalkManager(HopkinsEngine *vm) {
 	_vm = vm;
-	_characterBuffer = NULL;
-	_characterPalette = NULL;
-	_characterSprite = NULL;
-	_characterAnim = NULL;
+	_characterBuffer = g_PTRNUL;
+	_characterPalette = g_PTRNUL;
+	_characterSprite = g_PTRNUL;
+	_characterAnim = g_PTRNUL;
 	_characterSize = 0;
 	_dialogueMesgId1 = _dialogueMesgId2 = _dialogueMesgId3 = _dialogueMesgId4 = 0;
 	_paletteBufferIdx = 0;