[Scummvm-cvs-logs] SF.net SVN: scummvm: [21746] scummvm/trunk/engines/simon
eriktorbjorn at users.sourceforge.net
eriktorbjorn at users.sourceforge.net
Mon Apr 10 00:03:03 CEST 2006
Revision: 21746
Author: eriktorbjorn
Date: 2006-04-10 00:02:28 -0700 (Mon, 10 Apr 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=21746&view=rev
Log Message:
-----------
Merged o_unk_103() into o1_cls().
Modified Paths:
--------------
scummvm/trunk/engines/simon/items.cpp
scummvm/trunk/engines/simon/simon.h
Modified: scummvm/trunk/engines/simon/items.cpp
===================================================================
--- scummvm/trunk/engines/simon/items.cpp 2006-04-10 06:57:44 UTC (rev 21745)
+++ scummvm/trunk/engines/simon/items.cpp 2006-04-10 07:02:28 UTC (rev 21746)
@@ -909,7 +909,12 @@
void SimonEngine::o1_cls() {
// 103
- o_unk_103();
+ mouseOff();
+ removeIconArray(_curWindow);
+ showMessageFormat("\x0C");
+ _oracleMaxScrollY = 0;
+ _noOracleScroll = 0;
+ mouseOn();
}
void SimonEngine::o1_closeWindow() {
@@ -1977,15 +1982,6 @@
window->text_color = color;
}
-void SimonEngine::o_unk_103() {
- mouseOff();
- removeIconArray(_curWindow);
- showMessageFormat("\x0C");
- _oracleMaxScrollY = 0;
- _noOracleScroll = 0;
- mouseOn();
-}
-
void SimonEngine::o_kill_sprite_simon1(uint a) {
uint16 b = to16Wrapper(a);
_lockWord |= 0x8000;
Modified: scummvm/trunk/engines/simon/simon.h
===================================================================
--- scummvm/trunk/engines/simon/simon.h 2006-04-10 06:57:44 UTC (rev 21745)
+++ scummvm/trunk/engines/simon/simon.h 2006-04-10 07:02:28 UTC (rev 21746)
@@ -558,7 +558,6 @@
void o_kill_sprite_simon2(uint a, uint b);
void changeWindow(uint a);
- void o_unk_103();
void closeWindow(uint a);
void clear_hitarea_bit_0x40(uint hitarea);
void set_hitarea_bit_0x40(uint hitarea);
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