[Scummvm-cvs-logs] SF.net SVN: scummvm:[48272] scummvm/trunk/engines/scumm
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Tue Mar 16 15:34:25 CET 2010
Revision: 48272
http://scummvm.svn.sourceforge.net/scummvm/?rev=48272&view=rev
Author: lordhoto
Date: 2010-03-16 14:34:25 +0000 (Tue, 16 Mar 2010)
Log Message:
-----------
Some style fixes.
Modified Paths:
--------------
scummvm/trunk/engines/scumm/costume.cpp
scummvm/trunk/engines/scumm/script_v0.cpp
scummvm/trunk/engines/scumm/verbs.cpp
Modified: scummvm/trunk/engines/scumm/costume.cpp
===================================================================
--- scummvm/trunk/engines/scumm/costume.cpp 2010-03-16 14:13:52 UTC (rev 48271)
+++ scummvm/trunk/engines/scumm/costume.cpp 2010-03-16 14:34:25 UTC (rev 48272)
@@ -75,7 +75,7 @@
0x17, 0x00, 0x01, 0x05, 0x16
};
-const byte v0ActorTalkArray[0x19] = {
+static const byte v0ActorTalkArray[0x19] = {
0x00, 0x06, 0x06, 0x06, 0x06,
0x06, 0x06, 0x00, 0x46, 0x06,
0x06, 0x06, 0x06, 0xFF, 0xFF,
@@ -1348,8 +1348,7 @@
}
void C64CostumeLoader::actorSpeak(ActorC64 *a, int &cmd) {
-
- if ((v0ActorTalkArray[ a->_number ] & 0x80))
+ if (v0ActorTalkArray[a->_number] & 0x80)
return;
if ((a->_speaking & 0x80))
@@ -1367,7 +1366,7 @@
// Enable/Disable speaking flag
if (frame == a->_talkStartFrame) {
- if ((v0ActorTalkArray[ a->_number ] & 0x40))
+ if (v0ActorTalkArray[a->_number] & 0x40)
return;
A->_speaking = 1;
@@ -1419,7 +1418,7 @@
// Is this the correct location?
// 0x073C
- if ((v0ActorTalkArray[ a->_number ] & 0x3F))
+ if (v0ActorTalkArray[a->_number] & 0x3F)
a->_cost.soundPos = (a->_cost.soundPos + 1) % 3;
}
Modified: scummvm/trunk/engines/scumm/script_v0.cpp
===================================================================
--- scummvm/trunk/engines/scumm/script_v0.cpp 2010-03-16 14:13:52 UTC (rev 48271)
+++ scummvm/trunk/engines/scumm/script_v0.cpp 2010-03-16 14:34:25 UTC (rev 48272)
@@ -636,8 +636,7 @@
a = derefActor(VAR(VAR_EGO), "o_loadRoomWithEgo");
//0x634F
- if ((((ActorC64*) a)->_miscflags & 0x40)) {
-
+ if (((ActorC64 *)a)->_miscflags & 0x40) {
// TODO: Check if this is the correct function
// to be calling here
stopObjectCode();
Modified: scummvm/trunk/engines/scumm/verbs.cpp
===================================================================
--- scummvm/trunk/engines/scumm/verbs.cpp 2010-03-16 14:13:52 UTC (rev 48271)
+++ scummvm/trunk/engines/scumm/verbs.cpp 2010-03-16 14:34:25 UTC (rev 48272)
@@ -690,7 +690,6 @@
// (which is not really the what-is script, as this verb never actually executes
// it merely seems to be some type of fallback)
if (getVerbEntrypoint(obj, 0x0F) != 0) {
-
entry = 0x0F;
}
}
@@ -728,7 +727,7 @@
bool ScummEngine_v0::verbMoveToActor(int actor) {
Actor *a = derefActor(VAR(VAR_EGO), "verbMoveToActor");
- Actor *a2 =derefActor(actor, "verbMoveToActor");
+ Actor *a2 = derefActor(actor, "verbMoveToActor");
int dist = getDist(a->getRealPos().x, a->getRealPos().y, a2->getRealPos().x, a2->getRealPos().y);
if (!a->_moving && dist > 4) {
@@ -812,7 +811,7 @@
// Ignore verbs?
Actor *a = derefActor(VAR(VAR_EGO), "verbObtain");
- if ((((ActorC64*) a)->_miscflags & 0x40)) {
+ if (((ActorC64 *)a)->_miscflags & 0x40) {
resetSentence(false);
return false;
}
@@ -825,7 +824,7 @@
if (_activeVerb != 13 && _activeVerb != 14) {
_v0ObjectInInventory = true;
- if (whereIsObject( obj ) == WIO_INVENTORY)
+ if (whereIsObject(obj) == WIO_INVENTORY)
_activeInventory = obj;
else
resetSentence();
@@ -904,7 +903,7 @@
if (verbMoveToActor(_activeActor)) {
// Ignore verbs?
Actor *a = derefActor(VAR(VAR_EGO), "verbExec");
- if ((((ActorC64*) a)->_miscflags & 0x40)) {
+ if (((ActorC64 *)a)->_miscflags & 0x40) {
resetSentence(false);
return false;
}
@@ -1075,9 +1074,9 @@
// Did we just change the selected inventory item?
if (prevInventory && prevInventory != _activeInventory && _activeInventory != _activeObject2) {
_v0ObjectInInventory = true;
- int prep = verbPrep( _activeInventory );
+ int prep = verbPrep(_activeInventory);
_v0ObjectInInventory = true;
- int prep2 = verbPrep( prevInventory );
+ int prep2 = verbPrep(prevInventory);
// Should the new inventory object remain as the secondary selected object
// Or should the new inventory object become primary?
@@ -1128,7 +1127,7 @@
if (_currentMode == 2 || _currentMode == 0)
return;
- if (!(((ActorC64*) a)->_miscflags & 0x80)) {
+ if (!(((ActorC64 *)a)->_miscflags & 0x80)) {
if (_activeVerb != 7) {
_activeVerb = over;
over = 0;
@@ -1157,7 +1156,7 @@
if (zone->number == kMainVirtScreen) {
// Ignore verbs?
- if ((((ActorC64*) a)->_miscflags & 0x40)) {
+ if (((ActorC64 *)a)->_miscflags & 0x40) {
resetSentence(false);
return;
}
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