GRIFFON: Some function renames

4 files changed, 38 insertions, 38 deletions

diff --git a/engines/griffon/engine.cpp b/engines/griffon/engine.cpp
index 0cfffac761..5d64bfb54a 100644
--- a/engines/griffon/engine.cpp
+++ b/engines/griffon/engine.cpp
@@ -4372,7 +4372,7 @@ void GriffonEngine::game_main() {
 	game_saveloadnew();
 }
 
-void GriffonEngine::game_newgame() {
+void GriffonEngine::newGame() {
 	float xofs = 0;
 	float ld = 0, add;
 	int cnt = 0;
@@ -4714,7 +4714,7 @@ void GriffonEngine::game_saveloadnew() {
 					}
 					// NEW GAME
 					if (currow == 0 && curcol == 0)
-						game_newgame();
+						newGame();
 
 					// LOAD GAME
 					if (currow == 0 && curcol == 1) {
@@ -4731,7 +4731,7 @@ void GriffonEngine::game_saveloadnew() {
 
 
 					if (lowerlock == 1 && curcol == 1 && tickpause < _ticks) {
-						if (state_save(currow - 1)) {
+						if (saveState(currow - 1)) {
 							_secstart = _secstart + _secsingame;
 							_secsingame = 0;
 							lowerlock = 0;
@@ -4741,7 +4741,7 @@ void GriffonEngine::game_saveloadnew() {
 					}
 
 					if (lowerlock == 1 && curcol == 2 && tickpause < _ticks) {
-						if (state_load(currow - 1)) {
+						if (loadState(currow - 1)) {
 							_player.walkspd = 1.1f;
 							_animspd = 0.5f;
 							attacking = false;
@@ -4819,7 +4819,7 @@ void GriffonEngine::game_saveloadnew() {
 		// read it only when needed!
 
 		for (int ff = 0; ff <= 3; ff++) {
-			state_load_player(ff);
+			loadPlayer(ff);
 
 			if (_playera.level > 0) {
 				char line[256];
@@ -7752,7 +7752,7 @@ void GriffonEngine::sys_initialize() {
 		_playerattackofs[3][i][1] = -sin(3.14159 * 2 * (i + 1) / 16) * 2;
 	}
 
-	sys_setupAudio();
+	setupAudio();
 }
 
 void GriffonEngine::sys_line(Graphics::TransparentSurface *buffer, int x1, int y1, int x2, int y2, int col) {
diff --git a/engines/griffon/griffon.h b/engines/griffon/griffon.h
index ca4d98cbb8..88372fef88 100644
--- a/engines/griffon/griffon.h
+++ b/engines/griffon/griffon.h
@@ -280,7 +280,7 @@ private:
 	void game_handlewalking();
 	void game_loadmap(int mapnum);
 	void game_main();
-	void game_newgame();
+	void newGame();
 	void game_playgame();
 	void game_processtrigger(int trignum);
 	void game_saveloadnew();
@@ -304,14 +304,14 @@ private:
 	void sys_LoadTriggers();
 	void sys_LoadObjectDB();
 	void sys_print(Graphics::TransparentSurface *buffer, const char *stri, int xloc, int yloc, int col);
-	void sys_progress(int w, int wm);
-	void sys_setupAudio();
+	void drawProgress(int w, int wm);
+	void setupAudio();
 	void sys_update();
 
 	Common::String makeSaveGameName(int slot);
-	int state_load(int slotnum);
-	int state_load_player(int slotnum);
-	int state_save(int slotnum);
+	int loadState(int slotnum);
+	int loadPlayer(int slotnum);
+	int saveState(int slotnum);
 
 	void setChannelVolume(int channel, int volume);
 	int getSoundHandle();
diff --git a/engines/griffon/saveload.cpp b/engines/griffon/saveload.cpp
index f0911fceed..ae2656768a 100644
--- a/engines/griffon/saveload.cpp
+++ b/engines/griffon/saveload.cpp
@@ -58,7 +58,7 @@ Common::String GriffonEngine::makeSaveGameName(int slot) {
 	return (_targetName + Common::String::format(".%02d", slot));
 }
 
-int GriffonEngine::state_load(int slotnum) {
+int GriffonEngine::loadState(int slotnum) {
 	Common::String filename = makeSaveGameName(slotnum);
 	Common::InSaveFile *file;
 	if (!(file = _saveFileMan->openForLoading(filename)))
@@ -129,7 +129,7 @@ int GriffonEngine::state_load(int slotnum) {
 }
 
 /* fill PLAYERTYPE _playera; */
-int GriffonEngine::state_load_player(int slotnum) {
+int GriffonEngine::loadPlayer(int slotnum) {
 	Common::String filename = makeSaveGameName(slotnum);
 	Common::InSaveFile *file;
 
@@ -182,7 +182,7 @@ int GriffonEngine::state_load_player(int slotnum) {
 	return 0; // fail
 }
 
-int GriffonEngine::state_save(int slotnum) {
+int GriffonEngine::saveState(int slotnum) {
 	Common::String filename = makeSaveGameName(slotnum);
 	Common::OutSaveFile *file;
 
diff --git a/engines/griffon/sound.cpp b/engines/griffon/sound.cpp
index 27ba2b3dc4..b27f13c899 100644
--- a/engines/griffon/sound.cpp
+++ b/engines/griffon/sound.cpp
@@ -110,7 +110,7 @@ DataChunk *cacheSound(const char *name) {
 	return res;
 }
 
-void GriffonEngine::sys_progress(int w, int wm) {
+void GriffonEngine::drawProgress(int w, int wm) {
 	long ccc = _videobuffer->format.RGBToColor(0, 255, 0);
 
 	rcDest.setWidth(w * 74 / wm);
@@ -122,7 +122,7 @@ void GriffonEngine::sys_progress(int w, int wm) {
 	g_system->getEventManager()->pollEvent(_event);
 }
 
-void GriffonEngine::sys_setupAudio() {
+void GriffonEngine::setupAudio() {
 	// FIXME
 	//Mix_OpenAudio(22050, MIX_DEFAULT_FORMAT, 2, 1024);
 
@@ -153,48 +153,48 @@ void GriffonEngine::sys_setupAudio() {
 	rcDest.setHeight(8);
 
 	_mboss = cacheSound("music/boss.ogg");
-	sys_progress(1, 21);
+	drawProgress(1, 21);
 	_mgardens = cacheSound("music/gardens.ogg");
-	sys_progress(2, 21);
+	drawProgress(2, 21);
 	_mgardens2 = cacheSound("music/gardens2.ogg");
-	sys_progress(3, 21);
+	drawProgress(3, 21);
 	_mgardens3 = cacheSound("music/gardens3.ogg");
-	sys_progress(4, 21);
+	drawProgress(4, 21);
 	_mgardens4 = cacheSound("music/gardens4.ogg");
-	sys_progress(5, 21);
+	drawProgress(5, 21);
 	_mendofgame = cacheSound("music/endofgame.ogg");
-	sys_progress(6, 21);
+	drawProgress(6, 21);
 	_mmenu = cacheSound("music/menu.ogg");
-	sys_progress(7, 21);
+	drawProgress(7, 21);
 
 	_sfx[0] = cacheSound("sfx/bite.ogg");
-	sys_progress(8, 21);
+	drawProgress(8, 21);
 	_sfx[1] = cacheSound("sfx/crystal.ogg");
-	sys_progress(9, 21);
+	drawProgress(9, 21);
 	_sfx[2] = cacheSound("sfx/door.ogg");
-	sys_progress(10, 21);
+	drawProgress(10, 21);
 	_sfx[3] = cacheSound("sfx/enemyhit.ogg");
-	sys_progress(11, 21);
+	drawProgress(11, 21);
 	_sfx[4] = cacheSound("sfx/ice.ogg");
-	sys_progress(12, 21);
+	drawProgress(12, 21);
 	_sfx[5] = cacheSound("sfx/lever.ogg");
-	sys_progress(13, 21);
+	drawProgress(13, 21);
 	_sfx[6] = cacheSound("sfx/lightning.ogg");
-	sys_progress(14, 21);
+	drawProgress(14, 21);
 	_sfx[7] = cacheSound("sfx/metalhit.ogg");
-	sys_progress(15, 21);
+	drawProgress(15, 21);
 	_sfx[8] = cacheSound("sfx/powerup.ogg");
-	sys_progress(16, 21);
+	drawProgress(16, 21);
 	_sfx[9] = cacheSound("sfx/rocks.ogg");
-	sys_progress(17, 21);
+	drawProgress(17, 21);
 	_sfx[10] = cacheSound("sfx/swordhit.ogg");
-	sys_progress(18, 21);
+	drawProgress(18, 21);
 	_sfx[11] = cacheSound("sfx/throw.ogg");
-	sys_progress(19, 21);
+	drawProgress(19, 21);
 	_sfx[12] = cacheSound("sfx/chest.ogg");
-	sys_progress(20, 21);
+	drawProgress(20, 21);
 	_sfx[13] = cacheSound("sfx/fire.ogg");
-	sys_progress(21, 21);
+	drawProgress(21, 21);
 	_sfx[14] = cacheSound("sfx/beep.ogg");
 }