[Scummvm-cvs-logs] SF.net SVN: scummvm: [21246] scummvm/trunk/engines/kyra/sound_adlib.cpp
eriktorbjorn at users.sourceforge.net
eriktorbjorn at users.sourceforge.net
Sun Mar 12 14:48:03 CET 2006
Revision: 21246
Author: eriktorbjorn
Date: 2006-03-12 14:47:51 -0800 (Sun, 12 Mar 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=21246&view=rev
Log Message:
-----------
Renamed callback1 to primaryEffect and callback2 to secondaryEffect.
Modified Paths:
--------------
scummvm/trunk/engines/kyra/sound_adlib.cpp
Modified: scummvm/trunk/engines/kyra/sound_adlib.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound_adlib.cpp 2006-03-12 22:33:24 UTC (rev 21245)
+++ scummvm/trunk/engines/kyra/sound_adlib.cpp 2006-03-12 22:47:51 UTC (rev 21246)
@@ -160,8 +160,8 @@
uint8 regAx;
uint8 regBx;
typedef void (AdlibDriver::*Callback)(OutputState&);
- Callback callback1;
- Callback callback2;
+ Callback primaryEffect;
+ Callback secondaryEffect;
uint8 unk12;
uint8 opLevel1;
uint8 opLevel2;
@@ -716,10 +716,10 @@
}
}
- if (table.callback1)
- (this->*(table.callback1))(table);
- if (table.callback2)
- (this->*(table.callback2))(table);
+ if (table.primaryEffect)
+ (this->*(table.primaryEffect))(table);
+ if (table.secondaryEffect)
+ (this->*(table.secondaryEffect))(table);
}
}
@@ -764,8 +764,8 @@
table.tempo = -1;
table.priority = 0;
// normally here are nullfuncs but we set 0 for now
- table.callback1 = 0;
- table.callback2 = 0;
+ table.primaryEffect = 0;
+ table.secondaryEffect = 0;
table.unk3 = 0x01;
}
@@ -1283,7 +1283,7 @@
state.unk20 = state.unk21 = *dataptr++;
state.unk22 = *dataptr++;
state.offset = READ_LE_UINT16(dataptr); dataptr += 2;
- state.callback2 = &AdlibDriver::secondaryEffect1;
+ state.secondaryEffect = &AdlibDriver::secondaryEffect1;
return 0;
}
@@ -1317,14 +1317,14 @@
state.unk29 = value;
state.unk30 = READ_BE_UINT16(dataptr);
dataptr += 2;
- state.callback1 = &AdlibDriver::primaryEffect1;
+ state.primaryEffect = &AdlibDriver::primaryEffect1;
state.unk31 = -1;
return 0;
}
int AdlibDriver::update_removePrimaryEffect1(uint8 *&dataptr, OutputState &state, uint8 value) {
--dataptr;
- state.callback1 = 0;
+ state.primaryEffect = 0;
state.unk30 = 0;
return 0;
}
@@ -1341,7 +1341,7 @@
state.unk34 = temp + 1;
state.unk35 = temp << 1;
state.unk36 = *dataptr++;
- state.callback1 = &AdlibDriver::primaryEffect2;
+ state.primaryEffect = &AdlibDriver::primaryEffect2;
return 0;
}
@@ -1404,7 +1404,7 @@
int AdlibDriver::update_removeSecondaryEffect1(uint8 *&dataptr, OutputState &state, uint8 value) {
--dataptr;
- state.callback2 = 0;
+ state.secondaryEffect = 0;
return 0;
}
@@ -1519,7 +1519,7 @@
int AdlibDriver::update_removePrimaryEffect2(uint8 *&dataptr, OutputState &state, uint8 value) {
--dataptr;
- state.callback1 = 0;
+ state.primaryEffect = 0;
return 0;
}
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