[Scummvm-cvs-logs] SF.net SVN: scummvm: [21904] scummvm/trunk/engines/simon
kirben at users.sourceforge.net
kirben at users.sourceforge.net
Sat Apr 15 00:58:02 CEST 2006
Revision: 21904
Author: kirben
Date: 2006-04-15 00:56:55 -0700 (Sat, 15 Apr 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=21904&view=rev
Log Message:
-----------
Minor cleanup
Modified Paths:
--------------
scummvm/trunk/engines/simon/simon.cpp
scummvm/trunk/engines/simon/simon.h
scummvm/trunk/engines/simon/verb.cpp
scummvm/trunk/engines/simon/vga.cpp
Modified: scummvm/trunk/engines/simon/simon.cpp
===================================================================
--- scummvm/trunk/engines/simon/simon.cpp 2006-04-15 06:47:26 UTC (rev 21903)
+++ scummvm/trunk/engines/simon/simon.cpp 2006-04-15 07:56:55 UTC (rev 21904)
@@ -1779,7 +1779,7 @@
goto get_out;
}
- setup_hitarea_from_pos(_mouseX, _mouseY, x);
+ boxController(_mouseX, _mouseY, x);
_lastHitArea3 = _lastHitArea;
if (x == 1 && _lastHitArea == NULL)
_lastHitArea3 = (HitArea *) -1;
Modified: scummvm/trunk/engines/simon/simon.h
===================================================================
--- scummvm/trunk/engines/simon/simon.h 2006-04-15 06:47:26 UTC (rev 21903)
+++ scummvm/trunk/engines/simon/simon.h 2006-04-15 07:56:55 UTC (rev 21904)
@@ -651,7 +651,7 @@
uint getWindowNum(WindowBlock *window);
- void setup_hitarea_from_pos(uint x, uint y, uint mode);
+ void boxController(uint x, uint y, uint mode);
void displayName(HitArea * ha);
void displayBoxStars();
void hitarea_stuff();
Modified: scummvm/trunk/engines/simon/verb.cpp
===================================================================
--- scummvm/trunk/engines/simon/verb.cpp 2006-04-15 06:47:26 UTC (rev 21903)
+++ scummvm/trunk/engines/simon/verb.cpp 2006-04-15 07:56:55 UTC (rev 21904)
@@ -634,7 +634,7 @@
}
}
-void SimonEngine::setup_hitarea_from_pos(uint x, uint y, uint mode) {
+void SimonEngine::boxController(uint x, uint y, uint mode) {
HitArea *best_ha;
HitArea *ha = _hitAreas;
uint count = ARRAYSIZE(_hitAreas);
Modified: scummvm/trunk/engines/simon/vga.cpp
===================================================================
--- scummvm/trunk/engines/simon/vga.cpp 2006-04-15 06:47:26 UTC (rev 21903)
+++ scummvm/trunk/engines/simon/vga.cpp 2006-04-15 07:56:55 UTC (rev 21904)
@@ -2427,7 +2427,7 @@
uint pos = 0;
uint16 y = vcReadVar(16);
- while(y > readUint16Wrapper(p + 1)) {
+ while (y >= readUint16Wrapper(p + 1)) {
p += 2;
pos++;
}
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