[Scummvm-cvs-logs] SF.net SVN: scummvm: [20651] scummvm/trunk/engines/sword2

eriktorbjorn at users.sourceforge.net eriktorbjorn at users.sourceforge.net
Sun Feb 12 11:35:05 CET 2006


Revision: 20651
Author:   eriktorbjorn
Date:     2006-02-12 11:33:45 -0800 (Sun, 12 Feb 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm?rev=20651&view=rev

Log Message:
-----------
Renamed files for consistency with other engines:

    build_display  -> screen
    save_rest      -> saveload

More to come, no doubt.

Modified Paths:
--------------
    scummvm/trunk/engines/sword2/anims.cpp
    scummvm/trunk/engines/sword2/function.cpp
    scummvm/trunk/engines/sword2/module.mk
    scummvm/trunk/engines/sword2/mouse.cpp
    scummvm/trunk/engines/sword2/render.cpp
    scummvm/trunk/engines/sword2/sprite.cpp
    scummvm/trunk/engines/sword2/sword2.cpp
    scummvm/trunk/engines/sword2/sword2.h
Modified: scummvm/trunk/engines/sword2/anims.cpp
===================================================================
--- scummvm/trunk/engines/sword2/anims.cpp	2006-02-12 19:32:54 UTC (rev 20650)
+++ scummvm/trunk/engines/sword2/anims.cpp	2006-02-12 19:33:45 UTC (rev 20651)
@@ -30,7 +30,7 @@
 
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
-#include "sword2/build_display.h"
+#include "sword2/screen.h"
 #include "sword2/interpreter.h"
 #include "sword2/logic.h"
 #include "sword2/maketext.h"

Modified: scummvm/trunk/engines/sword2/function.cpp
===================================================================
--- scummvm/trunk/engines/sword2/function.cpp	2006-02-12 19:32:54 UTC (rev 20650)
+++ scummvm/trunk/engines/sword2/function.cpp	2006-02-12 19:33:45 UTC (rev 20651)
@@ -25,7 +25,7 @@
 
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
-#include "sword2/build_display.h"
+#include "sword2/screen.h"
 #include "sword2/console.h"
 #include "sword2/interpreter.h"
 #include "sword2/logic.h"

Modified: scummvm/trunk/engines/sword2/module.mk
===================================================================
--- scummvm/trunk/engines/sword2/module.mk	2006-02-12 19:32:54 UTC (rev 20650)
+++ scummvm/trunk/engines/sword2/module.mk	2006-02-12 19:33:45 UTC (rev 20651)
@@ -4,7 +4,6 @@
 	_mouse.o \
 	animation.o \
 	anims.o \
-	build_display.o \
 	console.o \
 	controls.o \
 	d_draw.o \
@@ -26,7 +25,8 @@
 	render.o \
 	resman.o \
 	router.o \
-	save_rest.o \
+	saveload.o \
+	screen.o \
 	scroll.o \
 	sound.o \
 	speech.o \

Modified: scummvm/trunk/engines/sword2/mouse.cpp
===================================================================
--- scummvm/trunk/engines/sword2/mouse.cpp	2006-02-12 19:32:54 UTC (rev 20650)
+++ scummvm/trunk/engines/sword2/mouse.cpp	2006-02-12 19:33:45 UTC (rev 20651)
@@ -383,7 +383,7 @@
 	processMenu();
 
 	// Reset game palette, but not after a successful restore or restart!
-	// See RestoreFromBuffer() in save_rest.cpp
+	// See RestoreFromBuffer() in saveload.cpp
 
 	ScreenInfo *screenInfo = _vm->_screen->getScreenInfo();
 

Modified: scummvm/trunk/engines/sword2/render.cpp
===================================================================
--- scummvm/trunk/engines/sword2/render.cpp	2006-02-12 19:32:54 UTC (rev 20650)
+++ scummvm/trunk/engines/sword2/render.cpp	2006-02-12 19:33:45 UTC (rev 20651)
@@ -26,7 +26,7 @@
 
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
-#include "sword2/build_display.h"
+#include "sword2/screen.h"
 
 #ifdef BACKEND_8BIT
 #include "sword2/animation.h"

Modified: scummvm/trunk/engines/sword2/sprite.cpp
===================================================================
--- scummvm/trunk/engines/sword2/sprite.cpp	2006-02-12 19:32:54 UTC (rev 20650)
+++ scummvm/trunk/engines/sword2/sprite.cpp	2006-02-12 19:33:45 UTC (rev 20651)
@@ -23,7 +23,7 @@
 
 #include "sword2/sword2.h"
 #include "sword2/defs.h"
-#include "sword2/build_display.h"
+#include "sword2/screen.h"
 
 namespace Sword2 {
 

Modified: scummvm/trunk/engines/sword2/sword2.cpp
===================================================================
--- scummvm/trunk/engines/sword2/sword2.cpp	2006-02-12 19:32:54 UTC (rev 20650)
+++ scummvm/trunk/engines/sword2/sword2.cpp	2006-02-12 19:33:45 UTC (rev 20651)
@@ -666,7 +666,7 @@
 	_mouse->unpauseGame();
 	_sound->unpauseAllSound();
 
-	// Put back game screen palette; see build_display.cpp
+	// Put back game screen palette; see screen.cpp
 	_screen->setFullPalette(-1);
 
 	// If graphics level at max, turn up again

Modified: scummvm/trunk/engines/sword2/sword2.h
===================================================================
--- scummvm/trunk/engines/sword2/sword2.h	2006-02-12 19:32:54 UTC (rev 20650)
+++ scummvm/trunk/engines/sword2/sword2.h	2006-02-12 19:33:45 UTC (rev 20651)
@@ -33,11 +33,11 @@
 
 #include "common/util.h"
 
-#include "sword2/build_display.h"
+#include "sword2/screen.h"
 #include "sword2/header.h"
 #include "sword2/icons.h"
 #include "sword2/object.h"
-#include "sword2/save_rest.h"
+#include "sword2/saveload.h"
 
 #define	MAX_starts	100
 #define	MAX_description	100







More information about the Scummvm-git-logs mailing list