[Scummvm-cvs-logs] SF.net SVN: scummvm:[52415] scummvm/trunk/tools/create_hugo
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Sat Aug 28 00:13:30 CEST 2010
Revision: 52415
http://scummvm.svn.sourceforge.net/scummvm/?rev=52415&view=rev
Author: lordhoto
Date: 2010-08-27 22:13:30 +0000 (Fri, 27 Aug 2010)
Log Message:
-----------
HUGO: Silence some const cast warnings in create_hugo.
Modified Paths:
--------------
scummvm/trunk/tools/create_hugo/create_hugo.cpp
scummvm/trunk/tools/create_hugo/create_hugo.h
scummvm/trunk/tools/create_hugo/staticdata.h
Modified: scummvm/trunk/tools/create_hugo/create_hugo.cpp
===================================================================
--- scummvm/trunk/tools/create_hugo/create_hugo.cpp 2010-08-27 21:13:47 UTC (rev 52414)
+++ scummvm/trunk/tools/create_hugo/create_hugo.cpp 2010-08-27 22:13:30 UTC (rev 52415)
@@ -103,52 +103,52 @@
// Write textData
// textData_1w
nbrElem = sizeof(textData_1w) / sizeof(char *);
- writeTextArray(outFile, (char **) textData_1w, nbrElem);
+ writeTextArray(outFile, textData_1w, nbrElem);
// textData_2w
nbrElem = sizeof(textData_2w) / sizeof(char *);
- writeTextArray(outFile, (char **) textData_2w, nbrElem);
+ writeTextArray(outFile, textData_2w, nbrElem);
// textData_3w
nbrElem = sizeof(textData_3w) / sizeof(char *);
- writeTextArray(outFile, (char **) textData_3w, nbrElem);
+ writeTextArray(outFile, textData_3w, nbrElem);
// textData_1d
nbrElem = sizeof(textData_1d) / sizeof(char *);
- writeTextArray(outFile, (char **) textData_1d, nbrElem);
+ writeTextArray(outFile, textData_1d, nbrElem);
// textData_2d
nbrElem = sizeof(textData_2d) / sizeof(char *);
- writeTextArray(outFile, (char **) textData_2d, nbrElem);
+ writeTextArray(outFile, textData_2d, nbrElem);
// textData_3d
nbrElem = sizeof(textData_3d) / sizeof(char *);
- writeTextArray(outFile, (char **) textData_3d, nbrElem);
+ writeTextArray(outFile, textData_3d, nbrElem);
// Write string_t_Data
// string_t_Data_1w
nbrElem = sizeof(string_t_Data_1w) / sizeof(char *);
- writeTextArray(outFile, (char **) string_t_Data_1w, nbrElem);
+ writeTextArray(outFile, string_t_Data_1w, nbrElem);
// string_t_Data_2w
nbrElem = sizeof(string_t_Data_2w) / sizeof(char *);
- writeTextArray(outFile, (char **) string_t_Data_2w, nbrElem);
+ writeTextArray(outFile, string_t_Data_2w, nbrElem);
// string_t_Data_3w
nbrElem = sizeof(string_t_Data_3w) / sizeof(char *);
- writeTextArray(outFile, (char **) string_t_Data_3w, nbrElem);
+ writeTextArray(outFile, string_t_Data_3w, nbrElem);
// string_t_Data_1d
nbrElem = sizeof(string_t_Data_1d) / sizeof(char *);
- writeTextArray(outFile, (char **) string_t_Data_1d, nbrElem);
+ writeTextArray(outFile, string_t_Data_1d, nbrElem);
// string_t_Data_2d
nbrElem = sizeof(string_t_Data_2d) / sizeof(char *);
- writeTextArray(outFile, (char **) string_t_Data_2d, nbrElem);
+ writeTextArray(outFile, string_t_Data_2d, nbrElem);
// string_t_Data_3d
nbrElem = sizeof(string_t_Data_3d) / sizeof(char *);
- writeTextArray(outFile, (char **) string_t_Data_3d, nbrElem);
+ writeTextArray(outFile, string_t_Data_3d, nbrElem);
// arrayNouns_1w
nbrElem = sizeof(arrayNouns_1w) / sizeof(char **);
@@ -158,7 +158,7 @@
for (nbrSubElem = 1; strcmp(arrayNouns_1w[j][nbrSubElem], ""); nbrSubElem++)
;
nbrSubElem++;
- writeTextArray(outFile, (char **) arrayNouns_1w[j], nbrSubElem);
+ writeTextArray(outFile, arrayNouns_1w[j], nbrSubElem);
}
// arrayNouns_2w
@@ -169,7 +169,7 @@
for (nbrSubElem = 1; strcmp(arrayNouns_2w[j][nbrSubElem], ""); nbrSubElem++)
;
nbrSubElem++;
- writeTextArray(outFile, (char **) arrayNouns_2w[j], nbrSubElem);
+ writeTextArray(outFile, arrayNouns_2w[j], nbrSubElem);
}
// arrayNouns_3w
@@ -180,7 +180,7 @@
for (nbrSubElem = 1; strcmp(arrayNouns_3w[j][nbrSubElem], ""); nbrSubElem++)
;
nbrSubElem++;
- writeTextArray(outFile, (char **) arrayNouns_3w[j], nbrSubElem);
+ writeTextArray(outFile, arrayNouns_3w[j], nbrSubElem);
}
// arrayNouns_1d
@@ -191,7 +191,7 @@
for (nbrSubElem = 1; strcmp(arrayNouns_1d[j][nbrSubElem], ""); nbrSubElem++)
;
nbrSubElem++;
- writeTextArray(outFile, (char **) arrayNouns_1d[j], nbrSubElem);
+ writeTextArray(outFile, arrayNouns_1d[j], nbrSubElem);
}
// arrayNouns_2d
@@ -202,7 +202,7 @@
for (nbrSubElem = 1; strcmp(arrayNouns_2d[j][nbrSubElem], ""); nbrSubElem++)
;
nbrSubElem++;
- writeTextArray(outFile, (char **) arrayNouns_2d[j], nbrSubElem);
+ writeTextArray(outFile, arrayNouns_2d[j], nbrSubElem);
}
// arrayNouns_3d
@@ -213,7 +213,7 @@
for (nbrSubElem = 1; strcmp(arrayNouns_3d[j][nbrSubElem], ""); nbrSubElem++)
;
nbrSubElem++;
- writeTextArray(outFile, (char **) arrayNouns_3d[j], nbrSubElem);
+ writeTextArray(outFile, arrayNouns_3d[j], nbrSubElem);
}
// arrayVerbs_1w
@@ -224,7 +224,7 @@
for (nbrSubElem = 1; strcmp(arrayVerbs_1w[j][nbrSubElem], ""); nbrSubElem++)
;
nbrSubElem++;
- writeTextArray(outFile, (char **) arrayVerbs_1w[j], nbrSubElem);
+ writeTextArray(outFile, arrayVerbs_1w[j], nbrSubElem);
}
// arrayVerbs_2w
@@ -235,7 +235,7 @@
for (nbrSubElem = 1; strcmp(arrayVerbs_2w[j][nbrSubElem], ""); nbrSubElem++)
;
nbrSubElem++;
- writeTextArray(outFile, (char **) arrayVerbs_2w[j], nbrSubElem);
+ writeTextArray(outFile, arrayVerbs_2w[j], nbrSubElem);
}
// arrayVerbs_3w
@@ -246,7 +246,7 @@
for (nbrSubElem = 1; strcmp(arrayVerbs_3w[j][nbrSubElem], ""); nbrSubElem++)
;
nbrSubElem++;
- writeTextArray(outFile, (char **) arrayVerbs_3w[j], nbrSubElem);
+ writeTextArray(outFile, arrayVerbs_3w[j], nbrSubElem);
}
// arrayVerbs_1d
@@ -257,7 +257,7 @@
for (nbrSubElem = 1; strcmp(arrayVerbs_1d[j][nbrSubElem], ""); nbrSubElem++)
;
nbrSubElem++;
- writeTextArray(outFile, (char **) arrayVerbs_1d[j], nbrSubElem);
+ writeTextArray(outFile, arrayVerbs_1d[j], nbrSubElem);
}
// arrayVerbs_2d
@@ -268,7 +268,7 @@
for (nbrSubElem = 1; strcmp(arrayVerbs_2d[j][nbrSubElem], ""); nbrSubElem++)
;
nbrSubElem++;
- writeTextArray(outFile, (char **) arrayVerbs_2d[j], nbrSubElem);
+ writeTextArray(outFile, arrayVerbs_2d[j], nbrSubElem);
}
// arrayVerbs_3d
@@ -279,33 +279,33 @@
for (nbrSubElem = 1; strcmp(arrayVerbs_3d[j][nbrSubElem], ""); nbrSubElem++)
;
nbrSubElem++;
- writeTextArray(outFile, (char **) arrayVerbs_3d[j], nbrSubElem);
+ writeTextArray(outFile, arrayVerbs_3d[j], nbrSubElem);
}
// Write screenNames
// screenNames_1w
nbrElem = sizeof(screenNames_1w) / sizeof(char *);
- writeTextArray(outFile, (char **) screenNames_1w, nbrElem);
+ writeTextArray(outFile, screenNames_1w, nbrElem);
// screenNames_2w
nbrElem = sizeof(screenNames_2w) / sizeof(char *);
- writeTextArray(outFile, (char **) screenNames_2w, nbrElem);
+ writeTextArray(outFile, screenNames_2w, nbrElem);
// screenNames_3w
nbrElem = sizeof(screenNames_3w) / sizeof(char *);
- writeTextArray(outFile, (char **) screenNames_3w, nbrElem);
+ writeTextArray(outFile, screenNames_3w, nbrElem);
// screenNames_1d
nbrElem = sizeof(screenNames_1d) / sizeof(char *);
- writeTextArray(outFile, (char **) screenNames_1d, nbrElem);
+ writeTextArray(outFile, screenNames_1d, nbrElem);
// screenNames_2d
nbrElem = sizeof(screenNames_2d) / sizeof(char *);
- writeTextArray(outFile, (char **) screenNames_2d, nbrElem);
+ writeTextArray(outFile, screenNames_2d, nbrElem);
// screenNames_3d
nbrElem = sizeof(screenNames_3d) / sizeof(char *);
- writeTextArray(outFile, (char **) screenNames_3d, nbrElem);
+ writeTextArray(outFile, screenNames_3d, nbrElem);
// Write palette
writeUint16BE(outFile, SIZE_PAL_ARRAY);
@@ -314,10 +314,10 @@
}
// Write textEngine
- writeTextArray(outFile, (char **) textEngine, NUM_ENGINE_TEXT);
+ writeTextArray(outFile, textEngine, NUM_ENGINE_TEXT);
// Write textIntro
- writeTextArray(outFile, (char **) textIntro, NUM_INTRO_TEXT);
+ writeTextArray(outFile, textIntro, NUM_INTRO_TEXT);
// Write x_intro and y_intro
writeUint16BE(outFile, NUM_INTRO_TICK);
@@ -327,40 +327,40 @@
}
// Write textMouse
- writeTextArray(outFile, (char **) textMouse, NUM_MOUSE_TEXT);
+ writeTextArray(outFile, textMouse, NUM_MOUSE_TEXT);
// Write textParser
- writeTextArray(outFile, (char **) textParser, NUM_PARSER_TEXT);
+ writeTextArray(outFile, textParser, NUM_PARSER_TEXT);
// Write textSchedule
- writeTextArray(outFile, (char **) textSchedule, NUM_SCHEDULE_TEXT);
+ writeTextArray(outFile, textSchedule, NUM_SCHEDULE_TEXT);
// Write textUtil
- writeTextArray(outFile, (char **) textUtil, NUM_UTIL_TEXT);
+ writeTextArray(outFile, textUtil, NUM_UTIL_TEXT);
// arrayReqs_1w
nbrElem = sizeof(arrayReqs_1w) / sizeof(uint16 *);
- writeUint16Array(outFile, (uint16 **) arrayReqs_1w, nbrElem);
+ writeUint16Array(outFile, arrayReqs_1w, nbrElem);
// arrayReqs_2w
nbrElem = sizeof(arrayReqs_2w) / sizeof(uint16 *);
- writeUint16Array(outFile, (uint16 **) arrayReqs_2w, nbrElem);
+ writeUint16Array(outFile, arrayReqs_2w, nbrElem);
// arrayReqs_3w
nbrElem = sizeof(arrayReqs_3w) / sizeof(uint16 *);
- writeUint16Array(outFile, (uint16 **) arrayReqs_3w, nbrElem);
+ writeUint16Array(outFile, arrayReqs_3w, nbrElem);
// arrayReqs_1d
nbrElem = sizeof(arrayReqs_1d) / sizeof(uint16 *);
- writeUint16Array(outFile, (uint16 **) arrayReqs_1d, nbrElem);
+ writeUint16Array(outFile, arrayReqs_1d, nbrElem);
// arrayReqs_2d
nbrElem = sizeof(arrayReqs_2d) / sizeof(uint16 *);
- writeUint16Array(outFile, (uint16 **) arrayReqs_2d, nbrElem);
+ writeUint16Array(outFile, arrayReqs_2d, nbrElem);
// arrayReqs_3d
nbrElem = sizeof(arrayReqs_3d) / sizeof(uint16 *);
- writeUint16Array(outFile, (uint16 **) arrayReqs_3d, nbrElem);
+ writeUint16Array(outFile, arrayReqs_3d, nbrElem);
// hotspots_1w
nbrElem = sizeof(hotspots_1w) / sizeof(hotspot_t);
@@ -794,7 +794,7 @@
return 0;
}
-void writeTextArray(FILE *outFile, char *textArray[], int nbrText) {
+void writeTextArray(FILE *outFile, const char *textArray[], int nbrText) {
int len, len1, pad;
uint8 padBuf[DATAALIGNMENT];
@@ -821,7 +821,7 @@
}
}
-void writeUint16Array(FILE *outFile, uint16 *uint16Array[], int nbrElem) {
+void writeUint16Array(FILE *outFile, const uint16 *uint16Array[], int nbrElem) {
int nbrSubElem;
writeUint16BE(outFile, nbrElem);
@@ -838,7 +838,7 @@
}
}
-void writeHotspot(FILE *outFile, hotspot_t hotspots[], int nbrElem) {
+void writeHotspot(FILE *outFile, const hotspot_t hotspots[], int nbrElem) {
writeUint16BE(outFile, nbrElem);
for (int j = 0; j < nbrElem; j++) {
@@ -854,7 +854,7 @@
}
}
-void writeUseArray(FILE *outFile, uses_t uses[], int nbrElem) {
+void writeUseArray(FILE *outFile, const uses_t uses[], int nbrElem) {
int nbrSubElem;
writeUint16BE(outFile, nbrElem);
@@ -871,7 +871,7 @@
}
}
-void writeBackgroundArray(FILE *outFile, background_t background[], int nbrElem) {
+void writeBackgroundArray(FILE *outFile, const background_t background[], int nbrElem) {
writeUint16BE(outFile, nbrElem);
for (int j = 0; j < nbrElem; j++) {
@@ -884,7 +884,7 @@
}
}
-void writeCmdArray(FILE *outFile, cmd *cmdList[], int nbrElem) {
+void writeCmdArray(FILE *outFile, const cmd *cmdList[], int nbrElem) {
int nbrSubElem;
writeUint16BE(outFile, nbrElem);
@@ -906,7 +906,7 @@
}
}
-void writeScreenActs(FILE *outFile, uint16 *screenActs[], int nbrElem) {
+void writeScreenActs(FILE *outFile, const uint16 *screenActs[], int nbrElem) {
int nbrSubElem;
writeUint16BE(outFile, nbrElem);
@@ -924,7 +924,7 @@
}
}
-void writeObjectArray(FILE *outFile, object_t objects[], int nbrElem) {
+void writeObjectArray(FILE *outFile, const object_t objects[], int nbrElem) {
int nbrSubElem;
writeUint16BE(outFile, nbrElem);
@@ -979,7 +979,7 @@
}
}
-void writeActListArray(FILE *outFile, actList actListArr[], int nbrElem) {
+void writeActListArray(FILE *outFile, const actList actListArr[], int nbrElem) {
int nbrSubElem, nbrCpt;
byte subElemType;
Modified: scummvm/trunk/tools/create_hugo/create_hugo.h
===================================================================
--- scummvm/trunk/tools/create_hugo/create_hugo.h 2010-08-27 21:13:47 UTC (rev 52414)
+++ scummvm/trunk/tools/create_hugo/create_hugo.h 2010-08-27 22:13:30 UTC (rev 52415)
@@ -542,14 +542,14 @@
typedef void *actListPtr; // Ptr to a list of actions
typedef actListPtr *actList; // A list of actions
-void writeTextArray(FILE *outFile, char *textData[], int nbrText);
-void writeUint16Array(FILE *outFile, uint16 *uint16Array[], int nbrElem);
-void writeHotspot(FILE *outFile, hotspot_t hotspots[], int nbrElem);
-void writeUseArray(FILE *outFile, uses_t uses[], int nbrElem);
-void writeBackgroundArray(FILE *outFile, background_t background[], int nbrElem);
-void writeCmdArray(FILE *outFile, cmd *cmdList[], int nbrElem);
-void writeScreenActs(FILE *outFile, uint16 *screenActs[], int nbrElem);
-void writeObjectArray(FILE *outFile, object_t objects[], int nbrElem);
-void writeActListArray(FILE *outFile, actList actListArr[], int nbrElem);
+void writeTextArray(FILE *outFile, const char *textData[], int nbrText);
+void writeUint16Array(FILE *outFile, const uint16 *uint16Array[], int nbrElem);
+void writeHotspot(FILE *outFile, const hotspot_t hotspots[], int nbrElem);
+void writeUseArray(FILE *outFile, const uses_t uses[], int nbrElem);
+void writeBackgroundArray(FILE *outFile, const background_t background[], int nbrElem);
+void writeCmdArray(FILE *outFile, const cmd *cmdList[], int nbrElem);
+void writeScreenActs(FILE *outFile, const uint16 *screenActs[], int nbrElem);
+void writeObjectArray(FILE *outFile, const object_t objects[], int nbrElem);
+void writeActListArray(FILE *outFile, const actList actListArr[], int nbrElem);
#endif // CREATE_HUGO_H
Modified: scummvm/trunk/tools/create_hugo/staticdata.h
===================================================================
--- scummvm/trunk/tools/create_hugo/staticdata.h 2010-08-27 21:13:47 UTC (rev 52414)
+++ scummvm/trunk/tools/create_hugo/staticdata.h 2010-08-27 22:13:30 UTC (rev 52415)
@@ -1975,7 +1975,7 @@
uint16 rknife_1w[] = {kNKnife_1w, 0};
uint16 rbung_1w[] = {kNBung_1w, 0};
uint16 rDummy[] = {0, 0};
-uint16 *arrayReqs_1w[] = {rDummy,rkey_1w, rpkin_1w, rcandle_1w, rmask_1w, roil_1w, rknife_1w, rbung_1w, };
+const uint16 *arrayReqs_1w[] = {rDummy,rkey_1w, rpkin_1w, rcandle_1w, rmask_1w, roil_1w, rknife_1w, rbung_1w, };
uint16 rgarlic_2w[] = {kNGarlic_2w, 0};
uint16 rmatch_2w[] = {kNMatches_2w, 0};
@@ -1991,7 +1991,7 @@
uint16 rmagnify_2w[]= {kNMagnify_2w, 0};
uint16 rwill_2w[] = {kNWill_2w, 0};
uint16 rserum_2w[] = {kNBottle_2w, 0};
-uint16 *arrayReqs_2w[] = {
+const uint16 *arrayReqs_2w[] = {
rDummy, rgarlic_2w, rmatch_2w, rstick_2w, rdyn_2w,
rlamp_2w, rbanana_2w, rbell_2w, rcatnip_2w, rgun_2w,
rpaper_2w, rpencil_2w, rmagnify_2w, rwill_2w, rserum_2w
@@ -2004,7 +2004,7 @@
uint16 rbook_3w[] = {kNBook_3w, 0};
uint16 rbell_3w[] = {kNBell_3w, 0};
uint16 rpipe_3w[] = {kNPipe_3w, 0};
-uint16 *arrayReqs_3w[] = {rDummy,rpins_3w, rcheese_3w, rcrystal_3w, rexor_3w, rbook_3w, rbell_3w, rpipe_3w};
+const uint16 *arrayReqs_3w[] = {rDummy,rpins_3w, rcheese_3w, rcrystal_3w, rexor_3w, rbook_3w, rbell_3w, rpipe_3w};
uint16 rkey_1d[] = {kNKey_1d, 0};
uint16 rpkin_1d[] = {kNPkin_1d, 0};
@@ -2013,7 +2013,7 @@
uint16 roil_1d[] = {kNOilcan_1d, 0};
uint16 rknife_1d[] = {kNKnife_1d, 0};
uint16 rbung_1d[] = {kNBung_1d, 0};
-uint16 *arrayReqs_1d[] = {rDummy,rkey_1d, rpkin_1d, rcandle_1d, rmask_1d, roil_1d, rknife_1d, rbung_1d};
+const uint16 *arrayReqs_1d[] = {rDummy,rkey_1d, rpkin_1d, rcandle_1d, rmask_1d, roil_1d, rknife_1d, rbung_1d};
uint16 rgarlic_2d[] = {kNGarlic_2d, 0};
uint16 rmatch_2d[] = {kNMatches_2d, 0};
@@ -2030,7 +2030,7 @@
uint16 rwill_2d[] = {kNWill_2d, 0};
uint16 rserum_2d[] = {kNBottle_2d, 0};
-uint16 *arrayReqs_2d[] = {
+const uint16 *arrayReqs_2d[] = {
rDummy, rgarlic_2d, rmatch_2d, rstick_2d, rdyn_2d,
rlamp_2d, rbanana_2d, rbell_2d, rcatnip_2d, rgun_2d,
rpaper_2d, rpencil_2d, rmagnify_2d, rwill_2d, rserum_2d
@@ -2043,7 +2043,7 @@
uint16 rbook_3d[] = {kNBook_3d, 0};
uint16 rbell_3d[] = {kNBell_3d, 0};
-uint16 *arrayReqs_3d[] = {rDummy, rpins_3d, rcheese_3d, rcrystal_3d, rexor_3d, rbook_3d, rbell_3d};
+const uint16 *arrayReqs_3d[] = {rDummy, rpins_3d, rcheese_3d, rcrystal_3d, rexor_3d, rbook_3d, rbell_3d};
// List of 'hotspots' which are areas in which actions are taken if hero
@@ -4609,7 +4609,7 @@
cmd ward_1w[] = {openwdoors_1w, closewdoors_1w, knock_1w, emptyCmd};
cmd whistle_1w[] = {blowdw_1w, getdw_1w, emptyCmd};
-cmd *cmdList_1w[] = {
+const cmd *cmdList_1w[] = {
cmdDummy, boat_1w, bolt_1w, bung_1w, carpet_1w,
chop_1w, cupb_1w, door1_1w, door2_1w, door3_1w,
door4_1w, drac_1w, frank_1w, gold_1w, gwen_1w,
@@ -4727,7 +4727,7 @@
cmd will_2w[] = {readwill_2w, emptyCmd};
cmd yellow_2w[] = {pushyellow_2w, emptyCmd};
-cmd *cmdList_2w[] = {
+const cmd *cmdList_2w[] = {
cmdDummy, album_2w, balloon_2w, banana_2w, bell_2w,
blue_2w, book_2w, bottle_2w, button_2w, catnip_2w,
cupbp_2w, door1_2w, door2_2w, door3_2w, doordum_2w,
@@ -4822,7 +4822,7 @@
cmd cwpool_3w[] = {cdrinkpool_3w, cwaterpool_3w, emptyCmd};
cmd cwstream_3w[] = {cdrinkstream_3w, cwaterstream_3w, emptyCmd};
-cmd *cmdList_3w[] = {
+const cmd *cmdList_3w[] = {
cmdDummy, cbell_3w, cbook_3w, cbouillon_3w, ccage_3w,
ccandle_3w, ccheese_3w, cclay_3w, ccrystal_3w, cdart_3w,
cdoctor_3w, cdoor_3w, celephant_3w, cexit_3w, cflask_3w,
@@ -4907,7 +4907,7 @@
cmd ward_1d[] = {openwdoors_1d, closewdoors_1d, knock_1d, emptyCmd};
cmd whistle_1d[] = {getdw_1d, blowdw_1d, emptyCmd};
-cmd *cmdList_1d[] = {
+const cmd *cmdList_1d[] = {
cmdDummy,
boat_1d, bolt_1d, bung_1d, carpet_1d, chop_1d,
cupb_1d, door1_1d, door2_1d, door3_1d, door4_1d,
@@ -5011,7 +5011,7 @@
cmd will_2d[] = {readwill_2d, emptyCmd};
cmd yellow_2d[] = {pushyellow_2d, emptyCmd};
-cmd *cmdList_2d[] = {
+const cmd *cmdList_2d[] = {
cmdDummy, balloon_2d, banana_2d, bell_2d, blue_2d,
book_2d, bottle_2d, button_2d, catnip_2d, cupbp_2d,
door1_2d, door2_2d, door3_2d, dumb_2d, dynamite_2d,
@@ -5091,7 +5091,7 @@
cmd cwpool_3d[] = {cwaterpool_3d, emptyCmd};
cmd cwstream_3d[] = {cwaterstream_3d, emptyCmd};
-cmd *cmdList_3d[] = {
+const cmd *cmdList_3d[] = {
cmdDummy, cbell_3d, cbook_3d, cbouillon_3d, ccage_3d,
ccandle_3d, ccheese_3d, cclay_3d, ccrystal_3d, cdart_3d,
cdoor_3d, cexit_3d, cflask_3d, cghost_3d, cnative_3d,
@@ -5119,7 +5119,7 @@
uint16 s14acts_1w[] = {kALgoodbye_1w, 0}; // The end
uint16 s15acts_1w[] = {kALlab_1w, kALbox_1w, 0}; // Laboratory
-uint16 *screenActs_1w[] = {
+const uint16 *screenActs_1w[] = {
s0acts_1w, s1acts_1w, s2acts_1w, s3acts_1w, s4acts_1w,
s5acts_1w, s6acts_1w, s7acts_1w, s8acts_1w, s9acts_1w,
s10acts_1w, s11acts_1w, s12acts_1w, s13acts_1w, s14acts_1w,
@@ -5147,7 +5147,7 @@
uint16 s35acts_2w[] = {kALscr35_2w, 0}; // Organ
uint16 s36acts_2w[] = {kALscr36_2w, 0}; // Hestroom
uint16 s37acts_2w[] = {kALsong3_2w, 0}; // Retupmoc
-uint16 *screenActs_2w[] = {
+const uint16 *screenActs_2w[] = {
/* 0 */ s0acts_2w, s1acts_2w, s2acts_2w, s3acts_2w, s4acts_2w,
0, s6acts_2w, 0, 0, s9acts_2w,
/* 10 */ s10acts_2w, 0, 0, 0, s14acts_2w,
@@ -5179,7 +5179,7 @@
uint16 s18acts_3w[] = {kALcamp_3w, 0}; // At camp
uint16 s19acts_3w[] = {kALsunset_3w, 0}; // Bye bye!
uint16 s23acts_3w[] = {kALpath_3w, 0}; // Elephant
-uint16 *screenActs_3w[] = {
+const uint16 *screenActs_3w[] = {
/* 0 */ s0acts_3w, s1acts_3w, s2acts_3w, 0, 0,
0, 0, 0, 0, 0,
/* 10 */ 0, 0, 0, s13acts_3w, 0,
@@ -5206,7 +5206,7 @@
uint16 s14acts_1d[] = {kALgoodbye_1d, 0};
uint16 s15acts_1d[] = {kALlab_1d, 0};
-uint16 *screenActs_1d[] = {
+const uint16 *screenActs_1d[] = {
s0acts_1d, s1acts_1d, s2acts_1d, s3acts_1d, s4acts_1d,
s5acts_1d, s6acts_1d, s7acts_1d, s8acts_1d, s9acts_1d,
s10acts_1d, s11acts_1d, s12acts_1d, s13acts_1d, s14acts_1d,
@@ -5235,7 +5235,7 @@
uint16 s36acts_2d[] = {kALscr36_2d, 0}; // Hestroom
uint16 s37acts_2d[] = {kALsong3_2d, 0}; // Retupmoc
-uint16 *screenActs_2d[] = {
+const uint16 *screenActs_2d[] = {
s0acts_2d, s1acts_2d, s2acts_2d, s3acts_2d, s4acts_2d,
0, s6acts_2d, 0, 0, s9acts_2d,
s10acts_2d, 0, 0, 0, s14acts_2d,
@@ -5267,7 +5267,7 @@
uint16 s18acts_3d[] = {kALcamp_3d, 0}; // At camp
uint16 s19acts_3d[] = {kALsunset_3d, 0}; // Bye bye!
uint16 s23acts_3d[] = {kALpath_3d, 0}; // Elephant
-uint16 *screenActs_3d[] = {
+const uint16 *screenActs_3d[] = {
/* 0 */ s0acts_3d, s1acts_3d, s2acts_3d, 0, 0,
0, 0, 0, 0, 0,
/* 10 */ 0, 0, 0, s13acts_3d, 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