CGE: Fix GCC compiler warnings

4 files changed, 12 insertions, 8 deletions

diff --git a/engines/cge/cge_main.cpp b/engines/cge/cge_main.cpp
index b8b0a2e3cc..5f27f99c3c 100644
--- a/engines/cge/cge_main.cpp
+++ b/engines/cge/cge_main.cpp
@@ -53,7 +53,7 @@ namespace CGE {
 #define SVG0NAME    ("{{INIT}}" SVG_EXT)
 #define SVG0FILE    INI_FILE
 
-extern  uint16  _stklen = (STACK_SIZ * 2);
+uint16  _stklen = (STACK_SIZ * 2);
 
 VGA *Vga;
 Heart *_heart;
diff --git a/engines/cge/config.cpp b/engines/cge/config.cpp
index 4f5284b69b..9a8219dd6b 100644
--- a/engines/cge/config.cpp
+++ b/engines/cge/config.cpp
@@ -148,7 +148,7 @@ void CGEEngine::selectSound() {
 		SNPOST_(SNKILL, -1, 0, VMENU::Addr);
 	inf(Text->getText(STYPE_TEXT));
 	Talk->gotoxy(Talk->_x, FONT_HIG / 2);
-	for (i = 0; i < ArrayCount(DevName); i++)
+	for (i = 0; i < (int)ArrayCount(DevName); i++)
 		DevMenu[i].Text = Text->getText(DevName[i]);
 	(new VMENU(this, DevMenu, SCR_WID / 2, Talk->_y + Talk->_h + TEXT_VM + FONT_HIG))->setName(Text->getText(MENU_TEXT));
 }
diff --git a/engines/cge/events.cpp b/engines/cge/events.cpp
index 2b9cc7fc6c..e18890625f 100644
--- a/engines/cge/events.cpp
+++ b/engines/cge/events.cpp
@@ -222,6 +222,8 @@ void MOUSE::NewMouse(Common::Event &event) {
 		evt._msk = R_UP;
 		Buttons &= ~2;
 		break;
+	default:
+		break;
 	}
 }
 
@@ -253,6 +255,8 @@ void EventManager::poll() {
 			_mouse->NewMouse(_event);
 			handleEvents();
 			break;
+		default:
+			break;
 		}
 	}
 }
diff --git a/engines/cge/vga13h.cpp b/engines/cge/vga13h.cpp
index dc11ffbf6a..b4e9bff286 100644
--- a/engines/cge/vga13h.cpp
+++ b/engines/cge/vga13h.cpp
@@ -343,13 +343,13 @@ void Heart::setXTimer(uint16 *ptr, uint16 time) {
 }
 
 
-Sprite::Sprite(CGEEngine *vm, BMP_PTR *shp)
+Sprite::Sprite(CGEEngine *vm, BMP_PTR *shpP)
 	: _x(0), _y(0), _z(0), _nearPtr(0), _takePtr(0),
 	  _next(NULL), _prev(NULL), _seqPtr(NO_SEQ), _time(0), //Delay(0),
 	  _ext(NULL), _ref(-1), _cave(0), _vm(vm) {
 	memset(_file, 0, sizeof(_file));
 	*((uint16 *)&_flags) = 0;
-	setShapeList(shp);
+	setShapeList(shpP);
 }
 
 
@@ -378,16 +378,16 @@ BMP_PTR Sprite::shp() {
 }
 
 
-BMP_PTR *Sprite::setShapeList(BMP_PTR *shp) {
+BMP_PTR *Sprite::setShapeList(BMP_PTR *shpP) {
 	BMP_PTR *r = (_ext) ? _ext->_shpList : NULL;
 
 	_shpCnt = 0;
 	_w = 0;
 	_h = 0;
 
-	if (shp) {
+	if (shpP) {
 		BMP_PTR *p;
-		for (p = shp; *p; p++) {
+		for (p = shpP; *p; p++) {
 			BMP_PTR b = (*p); // ->Code();
 			if (b->_w > _w)
 				_w = b->_w;
@@ -396,7 +396,7 @@ BMP_PTR *Sprite::setShapeList(BMP_PTR *shp) {
 			_shpCnt++;
 		}
 		expand();
-		_ext->_shpList = shp;
+		_ext->_shpList = shpP;
 		if (!_ext->_seq)
 			setSeq((_shpCnt < 2) ? _seq1 : _seq2);
 	}