[Scummvm-cvs-logs] CVS: scummvm/saga ite_introproc.cpp,1.66,1.67 palanim.cpp,1.26,1.27 palanim.h,1.10,1.11 saga.h,1.116,1.117 scene.h,1.73,1.74
Eugene Sandulenko
sev at users.sourceforge.net
Wed Aug 10 08:05:40 CEST 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/saga actor.cpp,1.170,1.171 actor.h,1.91,1.92 interface.cpp,1.127,1.128 isomap.cpp,1.58,1.59 objectmap.cpp,1.44,1.45 puzzle.cpp,1.13,1.14 rscfile.cpp,1.37,1.38 saga.cpp,1.126,1.127 script.cpp,1.77,1.78 sfuncs.cpp,1.148,1.149 sthread.cpp,1.100,1.101
- Next message: [Scummvm-cvs-logs] CVS: scummvm/saga actor.cpp,1.171,1.172 animation.cpp,1.53,1.54 events.cpp,1.64,1.65 events.h,1.21,1.22 ihnm_introproc.cpp,1.52,1.53 interface.cpp,1.128,1.129 ite_introproc.cpp,1.67,1.68 palanim.cpp,1.27,1.28 scene.cpp,1.142,1.143 script.cpp,1.78,1.79 sfuncs.cpp,1.149,1.150
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30562
Modified Files:
ite_introproc.cpp palanim.cpp palanim.h saga.h scene.h
Log Message:
Reanme more minor struct to comply with our naiming standards.
Index: ite_introproc.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/ite_introproc.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- ite_introproc.cpp 10 Aug 2005 14:11:22 -0000 1.66
+++ ite_introproc.cpp 10 Aug 2005 15:01:23 -0000 1.67
@@ -86,7 +86,7 @@
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 IntroDialogue dialogue[]) {
TextListEntry textEntry;
TextListEntry *entry;
Event event;
@@ -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 IntroCredit credits[]) {
int game;
Common::Language lang;
@@ -377,7 +377,7 @@
Event *q_event;
int lang = _vm->getFeatures() & GF_LANG_DE ? 1 : 0;
- static const INTRO_DIALOGUE dialogue[][4] = {
+ static const IntroDialogue dialogue[][4] = {
{ { // English
RID_CAVE_VOICE_0,
"We see the sky, we see the land, we see the water, "
@@ -465,7 +465,7 @@
Event *q_event;
int lang = _vm->getFeatures() & GF_LANG_DE ? 1 : 0;
- static const INTRO_DIALOGUE dialogue[][3] = {
+ static const IntroDialogue dialogue[][3] = {
{ { // English
RID_CAVE_VOICE_4,
"The humans also knew the Secret of Life, and they "
@@ -549,7 +549,7 @@
Event *q_event;
int lang = _vm->getFeatures() & GF_LANG_DE ? 1 : 0;
- static const INTRO_DIALOGUE dialogue[][3] = {
+ static const IntroDialogue dialogue[][3] = {
{ { // English
RID_CAVE_VOICE_7,
"They taught us how to use our hands, and how to "
@@ -633,7 +633,7 @@
Event *q_event;
int lang = _vm->getFeatures() & GF_LANG_DE ? 1 : 0;
- static const INTRO_DIALOGUE dialogue[][4] = {
+ static const IntroDialogue dialogue[][4] = {
{ { // English
RID_CAVE_VOICE_10,
"And now we see the sky, the land, and the water that "
@@ -725,7 +725,7 @@
Event event;
Event *q_event;
- static const INTRO_CREDIT credits[] = {
+ static const IntroCredit credits[] = {
{EN_USA, kITEAny, kCHeader, "Producer"},
{DE_DEU, kITEAny, kCHeader, "Produzent"},
{UNK_LANG, kITEAny, kCText, "Walter Hochbrueckner"},
@@ -831,7 +831,7 @@
Event event;
Event *q_event;
- static const INTRO_CREDIT credits1[] = {
+ static const IntroCredit credits1[] = {
{EN_USA, kITEAny, kCHeader, "Game Design"},
{DE_DEU, kITEAny, kCHeader, "Spielentwurf"},
{UNK_LANG, kITEAny, kCText, "Talin, Joe Pearce, Robert McNally"},
@@ -845,7 +845,7 @@
int n_credits1 = ARRAYSIZE(credits1);
- static const INTRO_CREDIT credits2[] = {
+ static const IntroCredit credits2[] = {
{UNK_LANG, kITEWyrmKeep, kCHeader, "Art Direction"},
{UNK_LANG, kITEWyrmKeep, kCText, "Allison Hershey"},
{EN_USA, kITEAny, kCHeader, "Art"},
@@ -920,7 +920,7 @@
Event event;
Event *q_event;
- static const INTRO_CREDIT credits1[] = {
+ static const IntroCredit credits1[] = {
{EN_USA, kITEAny, kCHeader, "Programming"},
{DE_DEU, kITEAny, kCHeader, "Programmiert von"},
{UNK_LANG, kITEAny, kCText, "Talin, Walter Hochbrueckner,"},
@@ -937,7 +937,7 @@
int n_credits1 = ARRAYSIZE(credits1);
- static const INTRO_CREDIT credits2[] = {
+ static const IntroCredit credits2[] = {
{EN_USA, kITEAny, kCHeader, "Directed by"},
{DE_DEU, kITEAny, kCHeader, "Regie"},
{UNK_LANG, kITEAny, kCText, "Talin"}
Index: palanim.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/palanim.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- palanim.cpp 10 Aug 2005 14:11:22 -0000 1.26
+++ palanim.cpp 10 Aug 2005 15:01:23 -0000 1.27
@@ -64,13 +64,13 @@
debug(3, "PalAnim::loadPalAnim(): Loading %d PALANIM entries.", _entryCount);
- test_p = calloc(_entryCount, sizeof(PALANIM_ENTRY));
+ test_p = calloc(_entryCount, sizeof(PalanimEntry));
if (test_p == NULL) {
warning("PalAnim::loadPalAnim(): Allocation failure");
return MEM;
}
- _entries = (PALANIM_ENTRY *)test_p;
+ _entries = (PalanimEntry *)test_p;
for (i = 0; i < _entryCount; i++) {
int color_count;
Index: palanim.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/palanim.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- palanim.h 9 Jul 2005 16:23:44 -0000 1.10
+++ palanim.h 10 Aug 2005 15:01:23 -0000 1.11
@@ -30,7 +30,7 @@
#define PALANIM_CYCLETIME 100
-struct PALANIM_ENTRY {
+struct PalanimEntry {
uint16 pal_count;
uint16 color_count;
uint16 cycle;
@@ -38,9 +38,6 @@
Color *colors;
};
-struct PALANIM_DATA {
-};
-
class PalAnim {
public:
PalAnim(SagaEngine *vm);
@@ -56,7 +53,7 @@
bool _loaded;
uint16 _entryCount;
- PALANIM_ENTRY *_entries;
+ PalanimEntry *_entries;
};
} // End of namespace Saga
Index: saga.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/saga.h,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -d -r1.116 -r1.117
--- saga.h 4 Aug 2005 12:11:57 -0000 1.116
+++ saga.h 10 Aug 2005 15:01:23 -0000 1.117
@@ -242,11 +242,6 @@
}
};
-struct CLICKAREA {
- int n_points;
- Point *points;
-};
-
enum GameIds {
// Dreamers Guild
GID_ITE_DEMO_G = 0,
Index: scene.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/scene.h,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- scene.h 10 Aug 2005 14:11:22 -0000 1.73
+++ scene.h 10 Aug 2005 15:01:23 -0000 1.74
@@ -191,12 +191,12 @@
#define CREDIT_DURATION1 4000
-struct INTRO_DIALOGUE {
+struct IntroDialogue {
uint32 i_voice_rn;
const char *i_str;
};
-struct INTRO_CREDIT {
+struct IntroCredit {
Common::Language lang;
int game;
int type;
@@ -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 IntroDialogue dialogue[]);
+ Event *ITEQueueCredits(int delta_time, int duration, int n_credits, const IntroCredit credits[]);
int ITEIntroAnimProc(int param);
int ITEIntroCave1Proc(int param);
int ITEIntroCave2Proc(int param);
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/saga actor.cpp,1.170,1.171 actor.h,1.91,1.92 interface.cpp,1.127,1.128 isomap.cpp,1.58,1.59 objectmap.cpp,1.44,1.45 puzzle.cpp,1.13,1.14 rscfile.cpp,1.37,1.38 saga.cpp,1.126,1.127 script.cpp,1.77,1.78 sfuncs.cpp,1.148,1.149 sthread.cpp,1.100,1.101
- Next message: [Scummvm-cvs-logs] CVS: scummvm/saga actor.cpp,1.171,1.172 animation.cpp,1.53,1.54 events.cpp,1.64,1.65 events.h,1.21,1.22 ihnm_introproc.cpp,1.52,1.53 interface.cpp,1.128,1.129 ite_introproc.cpp,1.67,1.68 palanim.cpp,1.27,1.28 scene.cpp,1.142,1.143 script.cpp,1.78,1.79 sfuncs.cpp,1.149,1.150
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list