CRYO: More renaming

1 files changed, 35 insertions, 35 deletions

diff --git a/engines/cryo/eden.h b/engines/cryo/eden.h
index a42c7f929d..0774224bb4 100644
--- a/engines/cryo/eden.h
+++ b/engines/cryo/eden.h
@@ -65,7 +65,7 @@ private:
 	void flipMode();
 	void quitMirror();
 	void clictimbre();
-	void clicplanval();
+	void actionClickValleyPlan();
 	void gotoPlace(Goto *go);
 	void deplaval(uint16 roomNum);
 	void move(Direction dir);
@@ -177,10 +177,10 @@ private:
 	void load_perso_cour();
 	void fin_perso();
 	void no_perso();
-	void close_perso();
+	void closeCharacterScreen();
 	void displayBackgroundFollower();
-	void af_fondperso1();
-	void af_fondperso();
+	void displayCharacterBackground1();
+	void displayCharacterBackground();
 	void setCharacterIcon();
 	void showCharacter();
 	void displayCharacterPanel();
@@ -198,7 +198,7 @@ private:
 	void vavapers();
 	void citadelle();
 	void choixzone();
-	void showevents1();
+	void showEvents1();
 	void showEvents();
 	void parle_mfin();
 	void parlemoi_normal();
@@ -207,25 +207,25 @@ private:
 	void perso1(perso_t *perso);
 	void perso_normal(perso_t *perso);
 	void handleCharacterDialog(int16 pers);
-	void roi();
-	void dina();
-	void thoo();
-	void monk();
-	void bourreau();
-	void messager();
-	void mango();
-	void eve();
-	void azia();
-	void mammi();
-	void gardes();
-	void bambou();
-	void kabuka();
-	void fisher();
-	void dino();
-	void tyran();
-	void morkus();
+	void actionKing();
+	void actionDina();
+	void actionThoo();
+	void actionMonk();
+	void actionTormentor();
+	void actionMessenger();
+	void actionMango();
+	void actionEve();
+	void actionAzia();
+	void actionMammi();
+	void actionGuards();
+	void actionBamboo();
+	void actionKabuka();
+	void actionFisher();
+	void actionDino();
+	void actionTyran();
+	void actionMorkus();
 	void comment();
-	void adam();
+	void actionAdam();
 	void setChoiceYes();
 	void setChoiceNo();
 	bool isAnswerYes();
@@ -252,7 +252,7 @@ private:
 	void narrateur();
 	void vrf_phrases_file();
 	byte *gettxtad(int16 id);
-	void gotocarte();
+	void actionGotoMap();
 	void record();
 	bool dial_scan(dial_t *dial);
 	bool dialoscansvmas(dial_t *dial);
@@ -297,7 +297,7 @@ private:
 	void updateInfoList();
 	void init_globals();
 	void initRects();
-	void closesalle();
+	void closeRoom();
 	void displaySingleRoom(Room *room);
 	void displayRoom();
 	void displayPlace();
@@ -323,7 +323,7 @@ private:
 	void testPommeQ();
 	void FRDevents();
 	Icon *scan_icon_list(int16 x, int16 y, int16 index);
-	void update_cursor();
+	void updateCursor();
 	void mouse();
 	void showMovie(char arg1);
 	void playHNM(int16 num);
@@ -333,7 +333,7 @@ private:
 	void musicspy();
 	int loadmusicfile(int16 num);
 	void persovox();
-	void endpersovox();
+	void endCharacterSpeech();
 	void fademusicup();
 	void fademusica0(int16 delay);
 	object_t *getObjectPtr(int16 id);
@@ -342,19 +342,19 @@ private:
 	void winObject(int16 id);
 	void loseObject(int16 id);
 	void lostObject();
-	bool objecthere(int16 id);
+	bool isObjectHere(int16 id);
 	void objectmain(int16 id);
 	void getObject(int16 id);
 	void putObject();
 	void newObject(int16 id, int16 arg2);
 	void giveobjectal(int16 id);
 	void giveObject();
-	void takeObject();
+	void actionTakeObject();
 	void newMushroom();
 	void newEmptyNest();
 	void newNestWithEggs();
 	void newor();
-	void gotopanel();
+	void gotoPanel();
 	void noclicpanel();
 	void generique();
 	void cancel2();
@@ -494,14 +494,14 @@ private:
 	void engineMac();
 	void displayObject(cube_t *cube);
 	void loadMap(int file_id, byte *buffer);
-	void NEWcharge_objet_mob(cube_t *cube, int file_id, byte *texptr);
+	void NEWcharge_objet_mob(cube_t *cube, int fileNum, byte *texturePtr);
 	static int next_val(char **ptr, char *error);
 	void selectMap(int16 num);
 	void Eden_dep_and_rot();
 	void restoreZDEP();
 	void affiche_polygone_mapping(cube_t *cube, cubeface_t *face);
-	void trace_ligne_mapping(int16 r3, int16 r4, int16 r5, int16 r6, int16 r7, int16 r8, int16 r9, int16 r10, int16 *lines);
-	void affiche_ligne_mapping(int16 r3, int16 r4, byte *target, byte *texture);
+	void drawMappingLine(int16 r3, int16 r4, int16 r5, int16 r6, int16 r7, int16 r8, int16 r9, int16 r10, int16 *lines);
+	void displayMappingLine(int16 r3, int16 r4, byte *target, byte *texture);
 	int16 OpenDialog(void *arg1, void *arg2);
 	void LostEdenMac_InitPrefs();
 
@@ -619,8 +619,8 @@ private:
 	byte   *_musicBuf;
 	byte   *gameLipsync;
 	byte   *gamePhrases;
-	byte   *gameDialogs;   //TODO: rename to dialogs?
-	byte   *gameConditions;
+	byte   *_gameDialogs;   //TODO: rename to dialogs?
+	byte   *_gameConditions;
 	byte *_placeRawBuf;   //TODO: fixme
 	byte *_bankDataBuf;
 	Icon *_gameIcons;