[Scummvm-cvs-logs] CVS: scummvm/saga actor.cpp,1.169,1.170 animation.cpp,1.52,1.53 events.cpp,1.63,1.64 events.h,1.20,1.21 ihnm_introproc.cpp,1.51,1.52 interface.cpp,1.126,1.127 ite_introproc.cpp,1.65,1.66 palanim.cpp,1.25,1.26 scene.cpp,1.141,1.142 scene.h,1.72,1.73 script.cpp,1.76,1.77 sfuncs.cpp,1.147,1.148
Eugene Sandulenko
sev at users.sourceforge.net
Wed Aug 10 07:13:52 CEST 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/saga interface.cpp,1.125,1.126 interface.h,1.69,1.70 scene.cpp,1.140,1.141 sthread.cpp,1.99,1.100
- Next message: [Scummvm-cvs-logs] CVS: residual/dists/msvc8 residual.vcproj,1.13,1.14
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15226
Modified Files:
actor.cpp animation.cpp events.cpp events.h ihnm_introproc.cpp
interface.cpp ite_introproc.cpp palanim.cpp scene.cpp scene.h
script.cpp sfuncs.cpp
Log Message:
EVENT -> Event
Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/actor.cpp,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -d -r1.169 -r1.170
--- actor.cpp 8 Aug 2005 12:13:38 -0000 1.169
+++ actor.cpp 10 Aug 2005 14:11:22 -0000 1.170
@@ -598,7 +598,7 @@
}
void Actor::stepZoneAction(ActorData *actor, const HitZone *hitZone, bool exit, bool stopped) {
- EVENT event;
+ Event event;
if (actor != _protagonist) {
return;
@@ -2093,7 +2093,7 @@
void Actor::moveDragon(ActorData *actor) {
int16 dir0, dir1, dir2, dir3;
int16 moveType;
- EVENT event;
+ Event event;
const DragonMove *dragonMove;
if ((actor->actionCycle < 0) ||
Index: animation.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/animation.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- animation.cpp 29 Jul 2005 17:57:40 -0000 1.52
+++ animation.cpp 10 Aug 2005 14:11:22 -0000 1.53
@@ -125,7 +125,7 @@
}
void Anim::play(uint16 animId, int vectorTime, bool playing) {
- EVENT event;
+ Event event;
Surface *backGroundSurface;
byte *displayBuffer;
Index: events.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/events.cpp,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- events.cpp 8 Aug 2005 19:40:54 -0000 1.63
+++ events.cpp 10 Aug 2005 14:11:22 -0000 1.64
@@ -56,7 +56,7 @@
// First advances event times, then processes each event with the appropriate
// handler depending on the type of event.
int Events::handleEvents(long msec) {
- EVENT *event_p;
+ Event *event_p;
long delta_time;
int result;
@@ -66,7 +66,7 @@
// Process each event in list
for (EventList::iterator eventi = _eventList.begin(); eventi != _eventList.end(); ++eventi) {
- event_p = (EVENT *)eventi.operator->();
+ event_p = (Event *)eventi.operator->();
// Call the appropriate event handler for the specific event type
switch (event_p->type) {
@@ -98,14 +98,14 @@
if ((result == EVENT_DELETE) || (result == EVENT_INVALIDCODE)) {
// If there is no event chain, delete the base event.
if (event_p->chain == NULL) {
- eventi=_eventList.eraseAndPrev(eventi);
+ eventi = _eventList.eraseAndPrev(eventi);
} else {
// If there is an event chain present, move the next event
// in the chain up, adjust it by the previous delta time,
// and reprocess the event */
delta_time = event_p->time;
- EVENT *from_chain=event_p->chain;
- memcpy(event_p, from_chain,sizeof(*event_p));
+ Event *from_chain = event_p->chain;
+ memcpy(event_p, from_chain, sizeof(*event_p));
free(from_chain);
event_p->time += delta_time;
@@ -119,7 +119,7 @@
return SUCCESS;
}
-int Events::handleContinuous(EVENT *event) {
+int Events::handleContinuous(Event *event) {
double event_pc = 0.0; // Event completion percentage
int event_done = 0;
@@ -203,7 +203,7 @@
return EVENT_CONTINUE;
}
-int Events::handleImmediate(EVENT *event) {
+int Events::handleImmediate(Event *event) {
double event_pc = 0.0; // Event completion percentage
bool event_done = false;
@@ -262,7 +262,7 @@
return EVENT_BREAK;
}
-int Events::handleOneShot(EVENT *event) {
+int Events::handleOneShot(Event *event) {
Surface *backBuffer;
ScriptThread *sthread;
Rect rect;
@@ -468,14 +468,14 @@
return EVENT_DELETE;
}
-int Events::handleInterval(EVENT *event) {
+int Events::handleInterval(Event *event) {
return EVENT_DELETE;
}
// Schedules an event in the event list; returns a pointer to the scheduled
// event suitable for chaining if desired.
-EVENT *Events::queue(EVENT *event) {
- EVENT *queuedEvent;
+Event *Events::queue(Event *event) {
+ Event *queuedEvent;
queuedEvent = _eventList.pushBack(*event).operator->();
initializeEvent(queuedEvent);
@@ -485,24 +485,24 @@
// Places a 'add_event' on the end of an event chain given by 'head_event'
// (head_event may be in any position in the event chain)
-EVENT *Events::chain(EVENT *headEvent, EVENT *addEvent) {
+Event *Events::chain(Event *headEvent, Event *addEvent) {
if (headEvent == NULL) {
return queue(addEvent);
}
- EVENT *walkEvent;
+ Event *walkEvent;
for (walkEvent = headEvent; walkEvent->chain != NULL; walkEvent = walkEvent->chain) {
continue;
}
- walkEvent->chain = (EVENT *)malloc(sizeof(*walkEvent->chain));
+ walkEvent->chain = (Event *)malloc(sizeof(*walkEvent->chain));
*walkEvent->chain = *addEvent;
initializeEvent(walkEvent->chain);
return walkEvent->chain;
}
-int Events::initializeEvent(EVENT *event) {
+int Events::initializeEvent(Event *event) {
event->chain = NULL;
switch (event->type) {
case ONESHOT_EVENT:
@@ -522,13 +522,13 @@
}
int Events::clearList() {
- EVENT *chain_walk;
- EVENT *next_chain;
- EVENT *event_p;
+ Event *chain_walk;
+ Event *next_chain;
+ Event *event_p;
// Walk down event list
for (EventList::iterator eventi = _eventList.begin(); eventi != _eventList.end(); ++eventi) {
- event_p = (EVENT *)eventi.operator->();
+ event_p = (Event *)eventi.operator->();
// Only remove events not marked NODESTROY (engine events)
if (!(event_p->code & NODESTROY)) {
@@ -546,14 +546,14 @@
// Removes all events from the list (even NODESTROY)
int Events::freeList() {
- EVENT *chain_walk;
- EVENT *next_chain;
- EVENT *event_p;
+ Event *chain_walk;
+ Event *next_chain;
+ Event *event_p;
// Walk down event list
EventList::iterator eventi = _eventList.begin();
while (eventi != _eventList.end()) {
- event_p = (EVENT *)eventi.operator->();
+ event_p = (Event *)eventi.operator->();
// Remove any events chained off this one */
for (chain_walk = event_p->chain; chain_walk != NULL; chain_walk = next_chain) {
@@ -568,11 +568,11 @@
// Walks down the event list, updating event times by 'msec'.
int Events::processEventTime(long msec) {
- EVENT *event_p;
+ Event *event_p;
uint16 event_count = 0;
for (EventList::iterator eventi = _eventList.begin(); eventi != _eventList.end(); ++eventi) {
- event_p = (EVENT *)eventi.operator->();
+ event_p = (Event *)eventi.operator->();
event_p->time -= msec;
event_count++;
Index: events.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/events.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- events.h 30 Jul 2005 21:11:21 -0000 1.20
+++ events.h 10 Aug 2005 14:11:22 -0000 1.21
@@ -115,7 +115,7 @@
SET_PALETTE
};
-struct EVENT {
+struct Event {
unsigned int type;
unsigned int code; // Event operation category & flags
int op; // Event operation
@@ -130,13 +130,13 @@
long duration; // Duration of event
long d_reserved;
- EVENT *chain; // Event chain (For consecutive events)
- EVENT() {
+ Event *chain; // Event chain (For consecutive events)
+ Event() {
memset(this, 0, sizeof(*this));
}
};
-typedef SortedList<EVENT> EventList;
+typedef SortedList<Event> EventList;
#define EVENT_WARNINGCOUNT 1000
#define EVENT_MASK 0x00FF
@@ -155,16 +155,16 @@
int handleEvents(long msec);
int clearList();
int freeList();
- EVENT *queue(EVENT *event);
- EVENT *chain(EVENT *headEvent, EVENT *addEvent);
+ Event *queue(Event *event);
+ Event *chain(Event *headEvent, Event *addEvent);
private:
- int handleContinuous(EVENT * event);
- int handleOneShot(EVENT * event);
- int handleInterval(EVENT * event);
- int handleImmediate(EVENT *event);
+ int handleContinuous(Event * event);
+ int handleOneShot(Event * event);
+ int handleInterval(Event * event);
+ int handleImmediate(Event *event);
int processEventTime(long msec);
- int initializeEvent(EVENT * event);
+ int initializeEvent(Event * event);
private:
SagaEngine *_vm;
Index: ihnm_introproc.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/ihnm_introproc.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- ihnm_introproc.cpp 7 Aug 2005 00:00:41 -0000 1.51
+++ ihnm_introproc.cpp 10 Aug 2005 14:11:22 -0000 1.52
@@ -117,8 +117,8 @@
}
int Scene::IHNMIntroMovieProc1(int param) {
- EVENT event;
- EVENT *q_event;
+ Event event;
+ Event *q_event;
switch (param) {
case SCENE_BEGIN:
@@ -155,8 +155,8 @@
}
int Scene::IHNMIntroMovieProc2(int param) {
- EVENT event;
- EVENT *q_event;
+ Event event;
+ Event *q_event;
PalEntry *pal;
static PalEntry current_pal[PAL_ENTRIES];
@@ -241,8 +241,8 @@
}
int Scene::IHNMIntroMovieProc3(int param) {
- EVENT event;
- EVENT *q_event;
+ Event event;
+ Event *q_event;
PalEntry *pal;
static PalEntry current_pal[PAL_ENTRIES];
@@ -327,8 +327,8 @@
}
int Scene::IHNMHateProc(int param) {
- EVENT event;
- EVENT *q_event;
+ Event event;
+ Event *q_event;
switch (param) {
case SCENE_BEGIN:
Index: interface.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/interface.cpp,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -d -r1.126 -r1.127
--- interface.cpp 10 Aug 2005 13:56:51 -0000 1.126
+++ interface.cpp 10 Aug 2005 14:11:22 -0000 1.127
@@ -1186,7 +1186,7 @@
HitZone *hitZone;
ActorData *a;
ObjectData *o;
- EVENT event;
+ Event event;
switch (objectTypeId(obj)) {
case kGameObjectHitZone:
Index: ite_introproc.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/ite_introproc.cpp,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- ite_introproc.cpp 6 Aug 2005 18:28:42 -0000 1.65
+++ ite_introproc.cpp 10 Aug 2005 14:11:22 -0000 1.66
@@ -86,10 +86,10 @@
return SUCCESS;
}
-EVENT *Scene::ITEQueueDialogue(EVENT *q_event, int n_dialogues, const INTRO_DIALOGUE dialogue[]) {
+Event *Scene::ITEQueueDialogue(Event *q_event, int n_dialogues, const INTRO_DIALOGUE dialogue[]) {
TextListEntry textEntry;
TextListEntry *entry;
- EVENT event;
+ Event event;
int voice_len;
int i;
@@ -161,7 +161,7 @@
// Queue a page of credits text. The original interpreter did word-wrapping
// automatically. We currently don't.
-EVENT *Scene::ITEQueueCredits(int delta_time, int duration, int n_credits, const INTRO_CREDIT credits[]) {
+Event *Scene::ITEQueueCredits(int delta_time, int duration, int n_credits, const INTRO_CREDIT credits[]) {
int game;
Common::Language lang;
@@ -225,8 +225,8 @@
TextListEntry textEntry;
TextListEntry *entry;
- EVENT event;
- EVENT *q_event = NULL;
+ Event event;
+ Event *q_event = NULL;
textEntry.color = 255;
textEntry.effectColor = 0;
@@ -292,8 +292,8 @@
// Handles the introductory Dreamer's Guild / NWC logo animation scene.
int Scene::ITEIntroAnimProc(int param) {
- EVENT event;
- EVENT *q_event;
+ Event event;
+ Event *q_event;
switch (param) {
case SCENE_BEGIN:{
@@ -373,8 +373,8 @@
// Handles first introductory cave painting scene
int Scene::ITEIntroCave1Proc(int param) {
- EVENT event;
- EVENT *q_event;
+ Event event;
+ Event *q_event;
int lang = _vm->getFeatures() & GF_LANG_DE ? 1 : 0;
static const INTRO_DIALOGUE dialogue[][4] = {
@@ -461,8 +461,8 @@
// Handles second introductory cave painting scene
int Scene::ITEIntroCave2Proc(int param) {
- EVENT event;
- EVENT *q_event;
+ Event event;
+ Event *q_event;
int lang = _vm->getFeatures() & GF_LANG_DE ? 1 : 0;
static const INTRO_DIALOGUE dialogue[][3] = {
@@ -545,8 +545,8 @@
// Handles third introductory cave painting scene
int Scene::ITEIntroCave3Proc(int param) {
- EVENT event;
- EVENT *q_event;
+ Event event;
+ Event *q_event;
int lang = _vm->getFeatures() & GF_LANG_DE ? 1 : 0;
static const INTRO_DIALOGUE dialogue[][3] = {
@@ -629,8 +629,8 @@
// Handles fourth introductory cave painting scene
int Scene::ITEIntroCave4Proc(int param) {
- EVENT event;
- EVENT *q_event;
+ Event event;
+ Event *q_event;
int lang = _vm->getFeatures() & GF_LANG_DE ? 1 : 0;
static const INTRO_DIALOGUE dialogue[][4] = {
@@ -722,8 +722,8 @@
// Handles intro title scene (valley overlook)
int Scene::ITEIntroValleyProc(int param) {
- EVENT event;
- EVENT *q_event;
+ Event event;
+ Event *q_event;
static const INTRO_CREDIT credits[] = {
{EN_USA, kITEAny, kCHeader, "Producer"},
@@ -828,8 +828,8 @@
// Handles second intro credit screen (treehouse view)
int Scene::ITEIntroTreeHouseProc(int param) {
- EVENT event;
- EVENT *q_event;
+ Event event;
+ Event *q_event;
static const INTRO_CREDIT credits1[] = {
{EN_USA, kITEAny, kCHeader, "Game Design"},
@@ -917,8 +917,8 @@
// Handles third intro credit screen (path to puzzle tent)
int Scene::ITEIntroFairePathProc(int param) {
- EVENT event;
- EVENT *q_event;
+ Event event;
+ Event *q_event;
static const INTRO_CREDIT credits1[] = {
{EN_USA, kITEAny, kCHeader, "Programming"},
@@ -995,9 +995,9 @@
// Handles fourth intro credit screen (treehouse view)
int Scene::ITEIntroFaireTentProc(int param) {
- EVENT event;
- EVENT *q_event;
- EVENT *q_event_start;
+ Event event;
+ Event *q_event;
+ Event *q_event_start;
switch (param) {
case SCENE_BEGIN:
Index: palanim.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/palanim.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- palanim.cpp 19 Jul 2005 19:05:46 -0000 1.25
+++ palanim.cpp 10 Aug 2005 14:11:22 -0000 1.26
@@ -119,7 +119,7 @@
}
int PalAnim::cycleStart() {
- EVENT event;
+ Event event;
if (!_loaded) {
return FAILURE;
@@ -144,7 +144,7 @@
uint16 cycle;
uint16 cycle_limit;
- EVENT event;
+ Event event;
if (!_loaded) {
return FAILURE;
Index: scene.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/scene.cpp,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -d -r1.141 -r1.142
--- scene.cpp 10 Aug 2005 13:56:51 -0000 1.141
+++ scene.cpp 10 Aug 2005 14:11:22 -0000 1.142
@@ -251,7 +251,7 @@
void Scene::startScene() {
SceneQueueList::iterator queueIterator;
LoadSceneParams *sceneQueue;
- EVENT event;
+ Event event;
if (_sceneLoaded) {
error("Scene::start(): Error: Can't start game...scene already loaded");
@@ -596,8 +596,8 @@
void Scene::loadScene(LoadSceneParams *loadSceneParams) {
size_t i;
- EVENT event;
- EVENT *q_event;
+ Event event;
+ Event *q_event;
static PalEntry current_pal[PAL_ENTRIES];
if ((_vm->getGameType() == GType_IHNM) && (loadSceneParams->chapter != NO_CHAPTER_CHANGE)) {
Index: scene.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/scene.h,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- scene.h 6 Aug 2005 18:28:43 -0000 1.72
+++ scene.h 10 Aug 2005 14:11:22 -0000 1.73
@@ -38,7 +38,7 @@
class ObjectMap;
-struct EVENT;
+struct Event;
enum SceneFlags {
kSceneFlagISO = 1,
@@ -334,8 +334,8 @@
static int SC_ITEIntroFaireTentProc(int param, void *refCon);
private:
- EVENT *ITEQueueDialogue(EVENT *q_event, int n_dialogues, const INTRO_DIALOGUE dialogue[]);
- EVENT *ITEQueueCredits(int delta_time, int duration, int n_credits, const INTRO_CREDIT credits[]);
+ Event *ITEQueueDialogue(Event *q_event, int n_dialogues, const INTRO_DIALOGUE dialogue[]);
+ Event *ITEQueueCredits(int delta_time, int duration, int n_credits, const INTRO_CREDIT credits[]);
int ITEIntroAnimProc(int param);
int ITEIntroCave1Proc(int param);
int ITEIntroCave2Proc(int param);
Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/script.cpp,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- script.cpp 9 Aug 2005 16:01:03 -0000 1.76
+++ script.cpp 10 Aug 2005 14:11:22 -0000 1.77
@@ -373,7 +373,7 @@
int scriptEntrypointNumber = 0;
int scriptModuleNumber = 0;
int objectType;
- EVENT event;
+ Event event;
const char *excuseText;
int excuseSampleResourceId;
const HitZone *hitZone;
Index: sfuncs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sfuncs.cpp,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -d -r1.147 -r1.148
--- sfuncs.cpp 7 Aug 2005 00:00:42 -0000 1.147
+++ sfuncs.cpp 10 Aug 2005 14:11:22 -0000 1.148
@@ -354,7 +354,7 @@
ActorData *actor;
ObjectData *obj;
const HitZone *hitZone;
- EVENT event;
+ Event event;
objectId = thread->pop();
action = thread->pop();
@@ -1234,8 +1234,8 @@
Surface *backBuffer = _vm->_gfx->getBackBuffer();
static PalEntry cur_pal[PAL_ENTRIES];
PalEntry *pal;
- EVENT event;
- EVENT *q_event;
+ Event event;
+ Event *q_event;
if (_vm->getGameType() == GType_IHNM) {
warning("Psychic profile is not implemented");
@@ -1340,8 +1340,8 @@
void Script::sfPlacardOff(SCRIPTFUNC_PARAMS) {
static PalEntry cur_pal[PAL_ENTRIES];
PalEntry *pal;
- EVENT event;
- EVENT *q_event;
+ Event event;
+ Event *q_event;
thread->wait(kWaitTypePlacard);
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/saga interface.cpp,1.125,1.126 interface.h,1.69,1.70 scene.cpp,1.140,1.141 sthread.cpp,1.99,1.100
- Next message: [Scummvm-cvs-logs] CVS: residual/dists/msvc8 residual.vcproj,1.13,1.14
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list