[Scummvm-cvs-logs] CVS: scummvm/sword1 control.cpp,1.8,1.9 logic.cpp,1.23,1.24 resman.cpp,1.8,1.9 sword1.cpp,1.22,1.23

[Torbj?rn Andersson]

Update of /cvsroot/scummvm/scummvm/sword1
In directory sc8-pr-cvs1:/tmp/cvs-serv14932

Modified Files:
	control.cpp logic.cpp resman.cpp sword1.cpp 
Log Message:
Indentation fixes: changed spaces to tabs. (These tend to really stick out
in my editor, since it shows tabs as eight spaces, not four.)


Index: control.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/control.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- control.cpp	28 Dec 2003 15:02:21 -0000	1.8
+++ control.cpp	28 Dec 2003 19:03:35 -0000	1.9
@@ -274,7 +274,7 @@
 				}
 			} else if (id == BUTTON_SAVE_CANCEL)
 				return BUTTON_MAIN_PANEL; // mode down to main panel
-            break;
+			break;
 		case BUTTON_VOLUME_PANEL:
 			return id;
    	}
@@ -299,9 +299,9 @@
 	delete panel;
 
 	if (SwordEngine::_systemVars.deathScreenFlag)
-        createButtons(_deathButtons, 3);		
+		createButtons(_deathButtons, 3);		
 	else {
-        createButtons(_panelButtons, 8);
+		createButtons(_panelButtons, 8);
 		_buttons[6]->setSelected(SwordEngine::_systemVars.showText);
 	}
 
@@ -343,7 +343,7 @@
 	} else {
 		renderText(_lStrings[STR_RESTORE], _saveButtons[12].x + 30, _saveButtons[13].y, TEXT_LEFT_ALIGN);
 	}
-    readSavegameDescriptions();
+	readSavegameDescriptions();
 	_selectedSavegame = 255;
 	showSavegameNames();
 }
@@ -391,7 +391,7 @@
 bool SwordControl::saveToFile(void) {
 	if ((_selectedSavegame == 255) || !strlen(_saveNames[_selectedSavegame]))
 		return false; // no saveslot selected or no name entered
-    saveGameToFile(_selectedSavegame);
+	saveGameToFile(_selectedSavegame);
 	writeSavegameDescriptions();
 	return true;
 }
@@ -424,7 +424,7 @@
 			} while ((ch != 10) && (ch != 255));
 			curFileNum++;
 		} while (ch != 255);
-        _saveFiles = curFileNum;
+		_saveFiles = curFileNum;
 		for (uint8 cnt = _saveFiles; cnt < 64; cnt++)
 			_saveNames[cnt][0] = '\0';
 	} else
@@ -467,7 +467,7 @@
 	if (saving && (_selectedSavegame != 255)) // the player may have entered something, clear it again
 		strcpy(_saveNames[_selectedSavegame], _oldName);
 	if (num < _saveFiles) {
-        _selectedSavegame = num;
+		_selectedSavegame = num;
 		strcpy(_oldName, _saveNames[num]); // save for later
 	} else {
 		if (!saving)
@@ -530,7 +530,7 @@
 		width += FROM_LE_16(_resMan->fetchFrame(_font, *str - 32)->width) - 3;
 		str++;
 	}
-    return width;
+	return width;
 }
 
 void SwordControl::renderText(const char *str, uint16 x, uint16 y, uint8 mode) {
@@ -650,7 +650,7 @@
 		playerRaw++;
 		bufPos += 4;
 	}
-    free(_restoreBuf);
+	free(_restoreBuf);
 	SwordLogic::_scriptVars[CHANGE_DIR] = cpt->o_dir;
 	SwordLogic::_scriptVars[CHANGE_X] = cpt->o_xcoord;
 	SwordLogic::_scriptVars[CHANGE_Y] = cpt->o_ycoord;
@@ -886,6 +886,6 @@
 	"M\xFAsica",
 	"Voz",
 	"Efeitos",
-    "Fim",
+	"Fim",
 	"UNIDADE CHEIA!",
 };

Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/logic.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- logic.cpp	22 Dec 2003 23:45:55 -0000	1.23
+++ logic.cpp	28 Dec 2003 19:03:35 -0000	1.24
@@ -196,7 +196,7 @@
 				if (id == GMASTER_79) {
 					// workaround for ending script.
 					// GMASTER_79 is not prepared for mega_interact receiving INS_quit
-                    fnSuicide(compact, id, 0, 0, 0, 0, 0, 0);
+					fnSuicide(compact, id, 0, 0, 0, 0, 0, 0);
 					logicRet = 0;
 				} else {
 					compact->o_logic = LOGIC_script;

Index: resman.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/resman.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- resman.cpp	20 Dec 2003 16:30:58 -0000	1.8
+++ resman.cpp	28 Dec 2003 19:03:35 -0000	1.9
@@ -94,7 +94,7 @@
 	free(cluIndex);
 	
 	if (_prj.clu[3]->grp[5]->noRes == 29)
-        for (uint8 cnt = 0; cnt < 29; cnt++)
+		for (uint8 cnt = 0; cnt < 29; cnt++)
 			_srIdList[cnt] = 0x04050000 | cnt;
 }
 

Index: sword1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/sword1.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- sword1.cpp	24 Dec 2003 17:42:22 -0000	1.22
+++ sword1.cpp	28 Dec 2003 19:03:35 -0000	1.23
@@ -1049,7 +1049,7 @@
 	}
 
 	do {
-        uint8 action = mainLoop();
+		uint8 action = mainLoop();
 
 		// the mainloop was left, we have to reinitialize.
 		reinitialize();
@@ -1116,7 +1116,7 @@
 
 			// do something smart here to implement pausing the game. If we even want that, that is.
 		} while ((SwordLogic::_scriptVars[SCREEN] == SwordLogic::_scriptVars[NEW_SCREEN]) && (retCode == 0));
-        
+
 		if ((retCode == 0) && (SwordLogic::_scriptVars[SCREEN] != 53) && _systemVars.wantFade) {
 			_screen->fadeDownPalette();
 			while (_screen->stillFading()) {