[Scummvm-git-logs] scummvm master -> c2e0e001a7c87e25b98ebc0005b5444961c0244e

Strangerke Strangerke at scummvm.org
Wed Feb 8 16:33:46 CET 2017


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
c2e0e001a7 CRYO: Fix some more GCC warnings


Commit: c2e0e001a7c87e25b98ebc0005b5444961c0244e
    https://github.com/scummvm/scummvm/commit/c2e0e001a7c87e25b98ebc0005b5444961c0244e
Author: Strangerke (strangerke at scummvm.org)
Date: 2017-02-08T16:30:52+01:00

Commit Message:
CRYO: Fix some more GCC warnings

Changed paths:
    engines/cryo/eden.cpp


diff --git a/engines/cryo/eden.cpp b/engines/cryo/eden.cpp
index 2be4799..b8e191c 100644
--- a/engines/cryo/eden.cpp
+++ b/engines/cryo/eden.cpp
@@ -2074,7 +2074,7 @@ void EdenGame::newValley() {
 }
 
 char EdenGame::whereIsCita() {
-	char res = -1;
+	char res = (char)-1;
 	for (Room *room = _globals->_citaAreaFirstRoom; room->_id != 0xFF; room++) {
 		if (!(room->_flags & RoomFlags::rfHasCitadel))
 			continue;
@@ -2149,7 +2149,7 @@ void EdenGame::vivredino() {
 				perso->_targetLoc = 0;
 			else if (!perso->_targetLoc) {
 				char cita = whereIsCita();
-				if (cita != -1) {
+				if (cita != (char)-1) {
 					perso->_targetLoc = cita;
 					perso->_speed = 2;
 					perso->_steps = 1;
@@ -2162,7 +2162,7 @@ void EdenGame::vivredino() {
 					perso->_targetLoc = 0;
 				else if (!perso->_targetLoc) {
 					char cita = whereIsCita();
-					if (cita != -1) {
+					if (cita != (char)-1) {
 						perso->_targetLoc = cita;
 						perso->_speed = 3;
 						perso->_steps = 1;
@@ -6890,7 +6890,7 @@ void EdenGame::noclicpanel() {
 			num = 1;
 			goto skip;
 		}
-		num = idx & 0x7F + 1;
+		num = (idx & 0x7F) + 1;
 		if (num >= 5)
 			num = 1;
 		if (num == _globals->_var43)
@@ -9191,7 +9191,7 @@ void EdenGame::paintFaces() {
 }
 
 void EdenGame::renderCube() {
-	for (int i = 0; i < sizeof(_cursor); i++)
+	for (uint16 i = 0; i < sizeof(_cursor); i++)
 		_cursor[i] = 0;
 	_cursorCenter = &_cursor[40 * 20 + 20];
 





More information about the Scummvm-git-logs mailing list