[Scummvm-cvs-logs] SF.net SVN: scummvm: [21752] scummvm/trunk/engines/simon
eriktorbjorn at users.sourceforge.net
eriktorbjorn at users.sourceforge.net
Mon Apr 10 01:01:09 CEST 2006
Revision: 21752
Author: eriktorbjorn
Date: 2006-04-10 01:00:29 -0700 (Mon, 10 Apr 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=21752&view=rev
Log Message:
-----------
Merged o_loadZone() and o_unloadZone() into o1_loadZone() and o1_unloadZone().
Modified Paths:
--------------
scummvm/trunk/engines/simon/items.cpp
scummvm/trunk/engines/simon/simon.cpp
scummvm/trunk/engines/simon/simon.h
Modified: scummvm/trunk/engines/simon/items.cpp
===================================================================
--- scummvm/trunk/engines/simon/items.cpp 2006-04-10 07:48:58 UTC (rev 21751)
+++ scummvm/trunk/engines/simon/items.cpp 2006-04-10 08:00:29 UTC (rev 21752)
@@ -856,7 +856,11 @@
void SimonEngine::o1_loadZone() {
// 97: load vga
- o_loadZone(getVarOrWord());
+ uint vga_res = getVarOrWord();
+
+ _lockWord |= 0x80;
+ loadZone(vga_res);
+ _lockWord &= ~0x80;
}
void SimonEngine::o1_animate() {
@@ -1401,7 +1405,12 @@
void SimonEngine::o1_unloadZone() {
// 184: clear vgapointer entry
- o_unloadZone(getVarOrWord());
+ uint a = getVarOrWord();
+ VgaPointersEntry *vpe = &_vgaBufferPointers[a];
+
+ vpe->sfxFile = NULL;
+ vpe->vgaFile1 = NULL;
+ vpe->vgaFile2 = NULL;
}
void SimonEngine::o1_loadStrings() {
Modified: scummvm/trunk/engines/simon/simon.cpp
===================================================================
--- scummvm/trunk/engines/simon/simon.cpp 2006-04-10 07:48:58 UTC (rev 21751)
+++ scummvm/trunk/engines/simon/simon.cpp 2006-04-10 08:00:29 UTC (rev 21752)
@@ -2172,12 +2172,6 @@
}
-void SimonEngine::o_loadZone(uint vga_res) {
- _lockWord |= 0x80;
- loadZone(vga_res);
- _lockWord &= ~0x80;
-}
-
void SimonEngine::loadZone(uint vga_res) {
VgaPointersEntry *vpe;
@@ -2296,16 +2290,6 @@
}
}
-void SimonEngine::o_unloadZone(uint a) {
- VgaPointersEntry *vpe;
-
- vpe = &_vgaBufferPointers[a];
-
- vpe->sfxFile = NULL;
- vpe->vgaFile1 = NULL;
- vpe->vgaFile2 = NULL;
-}
-
void SimonEngine::set_video_mode_internal(uint mode, uint vga_res_id) {
uint num, num_lines;
VgaPointersEntry *vpe;
Modified: scummvm/trunk/engines/simon/simon.h
===================================================================
--- scummvm/trunk/engines/simon/simon.h 2006-04-10 07:48:58 UTC (rev 21751)
+++ scummvm/trunk/engines/simon/simon.h 2006-04-10 08:00:29 UTC (rev 21752)
@@ -586,7 +586,6 @@
void o_pathfind(int x, int y, uint var_1, uint var_2);
void o_mouseOn();
void o_mouseOff();
- void o_unloadZone(uint a);
void o_unfreezeBottom();
void o_fadeToBlack();
@@ -688,7 +687,6 @@
void set_video_mode_internal(uint mode, uint vga_res_id);
- void o_loadZone(uint vga_res);
void loadZone(uint vga_res);
void loadSprite(uint windowNum, uint vga_res, uint vga_sprite_id, uint x, uint y, uint palette);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list