[Scummvm-cvs-logs] SF.net SVN: scummvm: [22794] scummvm/trunk/engines/agi

[fingolfin at users.sourceforge.net]

Revision: 22794
Author:   fingolfin
Date:     2006-05-31 03:53:04 -0700 (Wed, 31 May 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22794&view=rev

Log Message:
-----------
Fixed many const related warnings

Modified Paths:
--------------
    scummvm/trunk/engines/agi/global.cpp
    scummvm/trunk/engines/agi/logic.cpp
    scummvm/trunk/engines/agi/logic.h
    scummvm/trunk/engines/agi/menu.cpp
    scummvm/trunk/engines/agi/menu.h
    scummvm/trunk/engines/agi/text.cpp
    scummvm/trunk/engines/agi/text.h
Modified: scummvm/trunk/engines/agi/global.cpp
===================================================================
--- scummvm/trunk/engines/agi/global.cpp	2006-05-31 10:48:40 UTC (rev 22793)
+++ scummvm/trunk/engines/agi/global.cpp	2006-05-31 10:53:04 UTC (rev 22794)
@@ -29,14 +29,14 @@
 namespace Agi {
 
 int getflag(int n) {
-	uint8 *set = (uint8 *) & game.flags;
+	uint8 *set = (uint8 *) &game.flags;
 
 	set += n >> 3;
 	return (*set & (1 << (n & 0x07))) != 0;
 }
 
 void setflag(int n, int v) {
-	uint8 *set = (uint8 *) & game.flags;
+	uint8 *set = (uint8 *) &game.flags;
 
 	set += n >> 3;
 	if (v)
@@ -61,10 +61,10 @@
 }
 
 void decrypt(uint8 *mem, int len) {
-	uint8 *key;
+	const uint8 *key;
 	int i;
 
-	key = opt.agds ? (uint8 *)CRYPT_KEY_AGDS : (uint8 *)CRYPT_KEY_SIERRA;
+	key = opt.agds ? (const uint8 *)CRYPT_KEY_AGDS : (const uint8 *)CRYPT_KEY_SIERRA;
 
 	for (i = 0; i < len; i++)
 		*(mem + i) ^= *(key + (i % 11));

Modified: scummvm/trunk/engines/agi/logic.cpp
===================================================================
--- scummvm/trunk/engines/agi/logic.cpp	2006-05-31 10:48:40 UTC (rev 22793)
+++ scummvm/trunk/engines/agi/logic.cpp	2006-05-31 10:53:04 UTC (rev 22794)
@@ -68,7 +68,7 @@
 
 	/* allocate list of pointers to point into our data */
 
-	game.logics[n].texts = (char **)calloc(1 + game.logics[n].num_texts, sizeof(char *));
+	game.logics[n].texts = (const char **)calloc(1 + game.logics[n].num_texts, sizeof(char *));
 
 	/* cover header info */
 	m0 += mstart + 3;
@@ -77,7 +77,7 @@
 		/* move list of strings into list to make real pointers */
 		for (mc = 0; mc < game.logics[n].num_texts; mc++) {
 			mend = READ_LE_UINT16(m0 + mc * 2);
-			game.logics[n].texts[mc] = mend ? (char *)m0 + mend - 2 : (char *)"";
+			game.logics[n].texts[mc] = mend ? (const char *)m0 + mend - 2 : (const char *)"";
 		}
 		/* set loaded flag now its all completly loaded */
 		game.dir_logic[n].flags |= RES_LOADED;

Modified: scummvm/trunk/engines/agi/logic.h
===================================================================
--- scummvm/trunk/engines/agi/logic.h	2006-05-31 10:48:40 UTC (rev 22793)
+++ scummvm/trunk/engines/agi/logic.h	2006-05-31 10:53:04 UTC (rev 22794)
@@ -38,7 +38,7 @@
 	int sIP;		/**< saved IP */
 	int cIP;		/**< current IP */
 	int num_texts;		/**< number of messages */
-	char **texts;		/**< message list */
+	const char **texts;		/**< message list */
 };
 
 int decode_logic(int);

Modified: scummvm/trunk/engines/agi/menu.cpp
===================================================================
--- scummvm/trunk/engines/agi/menu.cpp	2006-05-31 10:48:40 UTC (rev 22793)
+++ scummvm/trunk/engines/agi/menu.cpp	2006-05-31 10:53:04 UTC (rev 22794)
@@ -191,7 +191,7 @@
 	}
 }
 
-void Menu::add(char *s) {
+void Menu::add(const char *s) {
 	agi_menu *m = new agi_menu;
 	m->text = strdup(s);
 	while (m->text[strlen(m->text) - 1] == ' ')
@@ -210,7 +210,7 @@
 	menubar.push_back(m);
 }
 
-void Menu::add_item(char *s, int code) {
+void Menu::add_item(const char *s, int code) {
 	int l;
 
 	agi_menu_option* d = new agi_menu_option;

Modified: scummvm/trunk/engines/agi/menu.h
===================================================================
--- scummvm/trunk/engines/agi/menu.h	2006-05-31 10:48:40 UTC (rev 22793)
+++ scummvm/trunk/engines/agi/menu.h	2006-05-31 10:53:04 UTC (rev 22794)
@@ -45,8 +45,8 @@
 	Menu();
 	~Menu();
 
-	void add(char *s);
-	void add_item(char *s, int code);
+	void add(const char *s);
+	void add_item(const char *s, int code);
 	void submit();
 	void set_item(int event, int state);
 	bool keyhandler(int key);

Modified: scummvm/trunk/engines/agi/text.cpp
===================================================================
--- scummvm/trunk/engines/agi/text.cpp	2006-05-31 10:48:40 UTC (rev 22793)
+++ scummvm/trunk/engines/agi/text.cpp	2006-05-31 10:53:04 UTC (rev 22794)
@@ -36,7 +36,7 @@
 	int maxx, minx, ofoff;
 	int update;
 	/* Note: Must be unsigned to use AGDS cyrillic characters! */
-	unsigned char *m;
+	const unsigned char *m;
 
 	/* kludge! */
 	update = 1;
@@ -57,7 +57,7 @@
 		minx = GFX_WIDTH;
 		ofoff = foff;
 
-		for (m = (unsigned char *)msg, x1 = y1 = 0; *m; m++) {
+		for (m = (const unsigned char *)msg, x1 = y1 = 0; *m; m++) {
 
 			if (*m >= 0x20 || *m == 1 || *m == 2 || *m == 3) {
 				/* FIXME */
@@ -393,7 +393,7 @@
 /**
  *
  */
-int print(char *p, int lin, int col, int len) {
+int print(const char *p, int lin, int col, int len) {
 	if (p == NULL)
 		return 0;
 

Modified: scummvm/trunk/engines/agi/text.h
===================================================================
--- scummvm/trunk/engines/agi/text.h	2006-05-31 10:48:40 UTC (rev 22793)
+++ scummvm/trunk/engines/agi/text.h	2006-05-31 10:53:04 UTC (rev 22794)
@@ -35,7 +35,7 @@
 void draw_window(int, int, int, int);
 void print_text(const char *, int, int, int, int, int, int);
 void print_text_console(const char *, int, int, int, int, int);
-int print(char *, int, int, int);
+int print(const char *, int, int, int);
 char *word_wrap_string(char *, int *);
 char *agi_sprintf(const char *);
 void write_status(void);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.