[Scummvm-cvs-logs] SF.net SVN: scummvm: [24430] scummvm/trunk/engines/agos
kirben at users.sourceforge.net
kirben at users.sourceforge.net
Sun Oct 22 09:43:17 CEST 2006
Revision: 24430
http://svn.sourceforge.net/scummvm/?rev=24430&view=rev
Author: kirben
Date: 2006-10-22 00:43:11 -0700 (Sun, 22 Oct 2006)
Log Message:
-----------
Cleanup
Modified Paths:
--------------
scummvm/trunk/engines/agos/agos.h
scummvm/trunk/engines/agos/input.cpp
Modified: scummvm/trunk/engines/agos/agos.h
===================================================================
--- scummvm/trunk/engines/agos/agos.h 2006-10-22 05:11:27 UTC (rev 24429)
+++ scummvm/trunk/engines/agos/agos.h 2006-10-22 07:43:11 UTC (rev 24430)
@@ -662,6 +662,9 @@
void unfreezeBottom();
TextLocation *getTextLocation(uint a);
+
+ uint setVerbText(HitArea *ha);
+ void waitForInput();
void setup_cond_c_helper();
uint16 getBackExit(int n);
@@ -756,7 +759,6 @@
void displayName(HitArea * ha);
void resetNameWindow();
void displayBoxStars();
- void waitForInput();
void invertBox_FF(HitArea *ha, bool state);
void invertBox(HitArea * ha, byte a, byte b, byte c, byte d);
Modified: scummvm/trunk/engines/agos/input.cpp
===================================================================
--- scummvm/trunk/engines/agos/input.cpp 2006-10-22 05:11:27 UTC (rev 24429)
+++ scummvm/trunk/engines/agos/input.cpp 2006-10-22 07:43:11 UTC (rev 24430)
@@ -31,9 +31,32 @@
namespace AGOS {
+uint AGOSEngine::setVerbText(HitArea *ha) {
+ uint id = 0xFFFF;
+
+ if (getGameType() == GType_ELVIRA1 || getGameType() == GType_ELVIRA2)
+ return id;
+
+ if (ha->flags & kBFTextBox) {
+ if (getGameType() == GType_PP)
+ id = ha->id;
+ else if (getGameType() == GType_FF && (_lastHitArea->flags & kBFHyperBox))
+ id = ha->data;
+ else
+ id = ha->flags / 256;
+ }
+ if (getGameType() == GType_PP)
+ _variableArray[199] = id;
+ else if (getGameType() == GType_WW)
+ _variableArray[10] = id;
+ else
+ _variableArray[60] = id;
+
+ return id;
+}
+
void AGOSEngine::setup_cond_c_helper() {
HitArea *last;
- uint id;
_noRightClick = 1;
@@ -128,21 +151,7 @@
inventoryDown(_lastHitArea->window);
} else if (_lastHitArea->item_ptr != NULL) {
_hitAreaObjectItem = _lastHitArea->item_ptr;
- id = 0xFFFF;
- if (_lastHitArea->flags & kBFTextBox) {
- if (getGameType() == GType_PP)
- id = _lastHitArea->id;
- else if (getGameType() == GType_FF && (_lastHitArea->flags & kBFHyperBox))
- id = _lastHitArea->data;
- else
- id = _lastHitArea->flags / 256;
- }
- if (getGameType() == GType_PP)
- _variableArray[199] = id;
- else if (getGameType() == GType_WW)
- _variableArray[10] = id;
- else
- _variableArray[60] = id;
+ setVerbText(_lastHitArea);
break;
}
}
@@ -241,22 +250,7 @@
ha->item_ptr) {
if_1:;
_hitAreaSubjectItem = ha->item_ptr;
- id = 0xFFFF;
- if (ha->flags & kBFTextBox) {
- if (getGameType() == GType_PP)
- id = _lastHitArea->id;
- else if (getGameType() == GType_FF && (ha->flags & kBFHyperBox))
- id = ha->data;
- else
- id = ha->flags / 256;
- }
- if (getGameType() == GType_PP)
- _variableArray[199] = id;
- else if (getGameType() == GType_WW)
- _variableArray[10] = id;
- else
- _variableArray[60] = id;
-
+ id = setVerbText(ha);
_nameLocked = 2;
displayName(ha);
_nameLocked = 1;
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