DREAMWEB: Fix compilation due to dreamgen.* function renaming.

1 files changed, 325 insertions, 325 deletions

diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 974b61dc00..60231c4e6e 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -19,366 +19,366 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  */
-	void screenupdate();
+	void screenUpdate();
 	bool quitRequested();
 	void startup();
 	void startup1();
-	void switchryanon();
-	void switchryanoff();
-	uint16 allocatemem(uint16 paragraphs);
-	void deallocatemem(uint16 segment);
+	void switchRyanOn();
+	void switchRyanOff();
+	uint16 allocateMem(uint16 paragraphs);
+	void deallocateMem(uint16 segment);
 	uint8 *workspace();
 	uint8 *textUnder();
-	void allocatework();
-	void clearwork();
-	void standardload();
-	uint16 standardload(const char *fileName); // Returns a segment handle which needs to be freed with deallocatemem for symmetry
-	void loadintotemp();
-	void loadintotemp2();
-	void loadintotemp3();
-	void loadintotemp(const char *fileName);
-	void loadintotemp2(const char *fileName);
-	void loadintotemp3(const char *fileName);
-	void loadtempcharset();
-	void loadtempcharset(const char *fileName);
+	void allocateWork();
+	void clearWork();
+	void standardLoad();
+	uint16 standardLoad(const char *fileName); // Returns a segment handle which needs to be freed with deallocatemem for symmetry
+	void loadIntoTemp();
+	void loadIntoTemp2();
+	void loadIntoTemp3();
+	void loadIntoTemp(const char *fileName);
+	void loadIntoTemp2(const char *fileName);
+	void loadIntoTemp3(const char *fileName);
+	void loadTempCharset();
+	void loadTempCharset(const char *fileName);
 	Frame *tempCharset();
-	void saveload();
-	void printcurs();
-	void delcurs();
-	void hangoncurs(uint16 frameCount);
-	void hangoncurs();
-	void multidump();
-	void multidump(uint16 x, uint16 y, uint8 width, uint8 height);
-	void frameoutv(uint8 *dst, const uint8 *src, uint16 pitch, uint16 width, uint16 height, int16 x, int16 y);
-	void frameoutnm(uint8 *dst, const uint8 *src, uint16 pitch, uint16 width, uint16 height, uint16 x, uint16 y);
-	void frameoutbh(uint8 *dst, const uint8 *src, uint16 pitch, uint16 width, uint16 height, uint16 x, uint16 y);
-	void frameoutfx(uint8 *dst, const uint8 *src, uint16 pitch, uint16 width, uint16 height, uint16 x, uint16 y);
-	void worktoscreen();
+	void saveLoad();
+	void printCurs();
+	void delCurs();
+	void hangOnCurs(uint16 frameCount);
+	void hangOnCurs();
+	void multiDump();
+	void multiDump(uint16 x, uint16 y, uint8 width, uint8 height);
+	void frameOutV(uint8 *dst, const uint8 *src, uint16 pitch, uint16 width, uint16 height, int16 x, int16 y);
+	void frameOutNm(uint8 *dst, const uint8 *src, uint16 pitch, uint16 width, uint16 height, uint16 x, uint16 y);
+	void frameOutBh(uint8 *dst, const uint8 *src, uint16 pitch, uint16 width, uint16 height, uint16 x, uint16 y);
+	void frameOutFx(uint8 *dst, const uint8 *src, uint16 pitch, uint16 width, uint16 height, uint16 x, uint16 y);
+	void workToScreen();
 	void workToScreenCPP();
-	void multiget();
-	void multiget(uint8 *dst, uint16 x, uint16 y, uint8 width, uint8 height);
-	void convertkey();
+	void multiGet();
+	void multiGet(uint8 *dst, uint16 x, uint16 y, uint8 width, uint8 height);
+	void convertKey();
 	void cls();
-	void printsprites();
-	void quickquit();
-	void readoneblock();
-	void printundermon();
-	void seecommandtail();
-	void randomnumber();
-	void quickquit2();
-	uint8 getnextword(const Frame *charSet, const uint8 *string, uint8 *totalWidth, uint8 *charCount);
-	void printboth(const Frame* charSet, uint16 *x, uint16 y, uint8 c, uint8 nextChar);
-	void printchar();
-	void printchar(const Frame* charSet, uint16 *x, uint16 y, uint8 c, uint8 nextChar, uint8 *width, uint8 *height);
-	void printchar(const Frame* charSet, uint16 x, uint16 y, uint8 c, uint8 nextChar, uint8 *width, uint8 *height);
-	void printdirect();
-	uint8 printdirect(const uint8** string, uint16 x, uint16 *y, uint8 maxWidth, bool centered);
-	uint8 printdirect(const uint8* string, uint16 x, uint16 y, uint8 maxWidth, bool centered);
-	void printmessage(uint16 x, uint16 y, uint8 index, uint8 maxWidth, bool centered);
-	void printmessage();
-	void usetimedtext();
-	void dumptimedtext();
-	void setuptimedtemp();
-	void setuptimedtemp(uint8 textIndex, uint8 voiceIndex, uint8 x, uint8 y, uint16 countToTimed, uint16 timeCount);
-	void getundertimed();
-	void putundertimed();
-	uint8 printslow(const uint8 *string, uint16 x, uint16 y, uint8 maxWidth, bool centered);
-	void printslow();
-	void dumptextline();
-	void getnumber();
-	uint8 getnumber(const Frame *charSet, const uint8 *string, uint16 maxWidth, bool centered, uint16 *offset);
-	uint8 kernchars(uint8 firstChar, uint8 secondChar, uint8 width);
-	void oldtonames();
-	void namestoold();
-	void loadpalfromiff();
-	void getroomdata();
-	Room *getroomdata(uint8 room);
-	void readheader();
-	void fillspace();
-	void startloading(const Room *room);
-	Sprite *spritetable();
-	void showframe();
-	void showframe(const Frame *frameData, uint16 x, uint16 y, uint16 frameNumber, uint8 effectsFlag, uint8 *width, uint8 *height);
-	void showframe(const Frame *frameData, uint16 x, uint16 y, uint16 frameNumber, uint8 effectsFlag);
-	void printasprite(const Sprite *sprite);
+	void printSprites();
+	void quickQuit();
+	void readOneBlock();
+	void printUnderMon();
+	void seeCommandTail();
+	void randomNumber();
+	void quickQuit2();
+	uint8 getNextWord(const Frame *charSet, const uint8 *string, uint8 *totalWidth, uint8 *charCount);
+	void printBoth(const Frame* charSet, uint16 *x, uint16 y, uint8 c, uint8 nextChar);
+	void printChar();
+	void printChar(const Frame* charSet, uint16 *x, uint16 y, uint8 c, uint8 nextChar, uint8 *width, uint8 *height);
+	void printChar(const Frame* charSet, uint16 x, uint16 y, uint8 c, uint8 nextChar, uint8 *width, uint8 *height);
+	void printDirect();
+	uint8 printDirect(const uint8** string, uint16 x, uint16 *y, uint8 maxWidth, bool centered);
+	uint8 printDirect(const uint8* string, uint16 x, uint16 y, uint8 maxWidth, bool centered);
+	void printMessage(uint16 x, uint16 y, uint8 index, uint8 maxWidth, bool centered);
+	void printMessage();
+	void useTimedText();
+	void dumpTimedText();
+	void setupTimedTemp();
+	void setupTimedTemp(uint8 textIndex, uint8 voiceIndex, uint8 x, uint8 y, uint16 countToTimed, uint16 timeCount);
+	void getUnderTimed();
+	void putUnderTimed();
+	uint8 printSlow(const uint8 *string, uint16 x, uint16 y, uint8 maxWidth, bool centered);
+	void printSlow();
+	void dumpTextLine();
+	void getNumber();
+	uint8 getNumber(const Frame *charSet, const uint8 *string, uint16 maxWidth, bool centered, uint16 *offset);
+	uint8 kernChars(uint8 firstChar, uint8 secondChar, uint8 width);
+	void oldToNames();
+	void namesToOld();
+	void loadPalFromIFF();
+	void getRoomData();
+	Room *getRoomData(uint8 room);
+	void readHeader();
+	void fillSpace();
+	void startLoading(const Room *room);
+	Sprite *spriteTable();
+	void showFrame();
+	void showFrame(const Frame *frameData, uint16 x, uint16 y, uint16 frameNumber, uint8 effectsFlag, uint8 *width, uint8 *height);
+	void showFrame(const Frame *frameData, uint16 x, uint16 y, uint16 frameNumber, uint8 effectsFlag);
+	void printASprite(const Sprite *sprite);
 	void width160();
-	void multiput(const uint8 *src, uint16 x, uint16 y, uint8 width, uint8 height);
-	void multiput();
-	void eraseoldobs();
-	void clearsprites();
-	Sprite *makesprite(uint8 x, uint8 y, uint16 updateCallback, uint16 frameData, uint16 somethingInDi);
-	void spriteupdate();
-	void initman();
-	void mainman(Sprite *sprite);
-	void facerightway();
+	void multiPut(const uint8 *src, uint16 x, uint16 y, uint8 width, uint8 height);
+	void multiPut();
+	void eraseOldObs();
+	void clearSprites();
+	Sprite *makeSprite(uint8 x, uint8 y, uint16 updateCallback, uint16 frameData, uint16 somethingInDi);
+	void spriteUpdate();
+	void initMan();
+	void mainMan(Sprite *sprite);
+	void faceRightWay();
 	void walking(Sprite *sprite);
-	void autosetwalk();
-	void checkdest(const RoomPaths *roomsPaths);
-	void aboutturn(Sprite *sprite);
-	void backobject(Sprite *sprite);
+	void autoSetWalk();
+	void checkDest(const RoomPaths *roomsPaths);
+	void aboutTurn(Sprite *sprite);
+	void backObject(Sprite *sprite);
 	void constant(Sprite *sprite, SetObject *objData);
 	void steady(Sprite *sprite, SetObject *objData);
 	void random(Sprite *sprite, SetObject *objData);
-	void dodoor(Sprite *sprite, SetObject *objData, Common::Rect check);
+	void doDoor(Sprite *sprite, SetObject *objData, Common::Rect check);
 	void doorway(Sprite *sprite, SetObject *objData);
-	void widedoor(Sprite *sprite, SetObject *objData);
-	void lockeddoorway(Sprite *sprite, SetObject *objData);
-	void liftsprite(Sprite *sprite, SetObject *objData);
-	Frame *findsource();
-	void showgamereel();
-	void showgamereel(ReelRoutine *routine);
-	void showreelframe(Reel *reel);
-	const Frame *getreelframeax(uint16 frame);
-	void turnpathon(uint8 param);
-	void turnpathoff(uint8 param);
-	void turnpathon();
-	void turnpathoff();
-	void turnanypathon(uint8 param, uint8 room);
-	void turnanypathoff(uint8 param, uint8 room);
-	void turnanypathon();
-	void turnanypathoff();
-	RoomPaths *getroomspaths();
-	void makebackob(SetObject *objData);
-	void modifychar();
-	void lockmon();
-	void cancelch0();
-	void cancelch1();
-	void plotreel();
-	Reel *getreelstart();
-	void dealwithspecial(uint8 firstParam, uint8 secondParam);
+	void wideDoor(Sprite *sprite, SetObject *objData);
+	void lockedDoorway(Sprite *sprite, SetObject *objData);
+	void liftSprite(Sprite *sprite, SetObject *objData);
+	Frame *findSource();
+	void showGameReel();
+	void showGameReel(ReelRoutine *routine);
+	void showReelFrame(Reel *reel);
+	const Frame *getReelFrameAX(uint16 frame);
+	void turnPathOn(uint8 param);
+	void turnPathOff(uint8 param);
+	void turnPathOn();
+	void turnPathOff();
+	void turnAnyPathOn(uint8 param, uint8 room);
+	void turnAnyPathOff(uint8 param, uint8 room);
+	void turnAnyPathOn();
+	void turnAnyPathOff();
+	RoomPaths *getRoomsPaths();
+	void makeBackOb(SetObject *objData);
+	void modifyChar();
+	void lockMon();
+	void cancelCh0();
+	void cancelCh1();
+	void plotReel();
+	Reel *getReelStart();
+	void dealWithSpecial(uint8 firstParam, uint8 secondParam);
 	void zoom();
 	void crosshair();
-	void showrain();
-	void deltextline();
-	void commandonly();
-	void commandonly(uint8 command);
-	void doblocks();
-	void checkifperson();
-	bool checkifperson(uint8 x, uint8 y);
-	void checkiffree();
-	bool checkiffree(uint8 x, uint8 y);
-	void checkifex();
-	bool checkifex(uint8 x, uint8 y);
-	const uint8 *findobname(uint8 type, uint8 index);
-	void copyname();
-	void copyname(uint8 type, uint8 index, uint8 *dst);
-	void commandwithob();
-	void commandwithob(uint8 command, uint8 type, uint8 index);
-	void showpanel();
-	void updatepeople();
-	void madmantext();
-	void madmode();
-	void movemap(uint8 param);
-	bool addalong(const uint8 *mapFlags);
-	bool addlength(const uint8 *mapFlags);
-	void getdimension();
-	void getdimension(uint8 *mapXstart, uint8 *mapYstart, uint8 *mapXsize, uint8 *mapYsize);
-	void getmapad();
-	void calcmapad();
-	uint8 getmapad(const uint8 *setData);
-	uint8 getxad(const uint8 *setData, uint8 *result);
-	uint8 getyad(const uint8 *setData, uint8 *result);
-	void calcfrframe();
-	void calcfrframe(uint8* width, uint8* height);
-	void finalframe();
-	void finalframe(uint16 *x, uint16 *y);
-	void showallobs();
-	void blocknametext();
-	void walktotext();
-	void personnametext();
-	void findxyfrompath();
-	void findormake();
-	void findormake(uint8 index, uint8 value, uint8 type);
-	DynObject *getfreead(uint8 index);
-	DynObject *getexad(uint8 index);
-	DynObject *geteitheradCPP();
-	SetObject *getsetad(uint8 index);
-	void *getanyad(uint8 *value1, uint8 *value2);
-	void *getanyaddir(uint8 index, uint8 flag);
-	void setallchanges();
-	void dochange(uint8 index, uint8 value, uint8 type);
-	void deletetaken();
+	void showRain();
+	void delTextLine();
+	void commandOnly();
+	void commandOnly(uint8 command);
+	void doBlocks();
+	void checkIfPerson();
+	bool checkIfPerson(uint8 x, uint8 y);
+	void checkIfFree();
+	bool checkIfFree(uint8 x, uint8 y);
+	void checkIfEx();
+	bool checkIfEx(uint8 x, uint8 y);
+	const uint8 *findObName(uint8 type, uint8 index);
+	void copyName();
+	void copyName(uint8 type, uint8 index, uint8 *dst);
+	void commandWithOb();
+	void commandWithOb(uint8 command, uint8 type, uint8 index);
+	void showPanel();
+	void updatePeople();
+	void madmanText();
+	void madMode();
+	void moveMap(uint8 param);
+	bool addAlong(const uint8 *mapFlags);
+	bool addLength(const uint8 *mapFlags);
+	void getDimension();
+	void getDimension(uint8 *mapXstart, uint8 *mapYstart, uint8 *mapXsize, uint8 *mapYsize);
+	void getMapAd();
+	void calcMapAd();
+	uint8 getMapAd(const uint8 *setData);
+	uint8 getXAd(const uint8 *setData, uint8 *result);
+	uint8 getYAd(const uint8 *setData, uint8 *result);
+	void calcFrFrame();
+	void calcFrFrame(uint8* width, uint8* height);
+	void finalFrame();
+	void finalFrame(uint16 *x, uint16 *y);
+	void showAllObs();
+	void blockNameText();
+	void walkToText();
+	void personNameText();
+	void findXYFromPath();
+	void findOrMake();
+	void findOrMake(uint8 index, uint8 value, uint8 type);
+	DynObject *getFreeAd(uint8 index);
+	DynObject *getExAd(uint8 index);
+	DynObject *getEitherAdCPP();
+	SetObject *getSetAd(uint8 index);
+	void *getAnyAd(uint8 *value1, uint8 *value2);
+	void *getAnyAdDir(uint8 index, uint8 flag);
+	void setAllChanges();
+	void doChange(uint8 index, uint8 value, uint8 type);
+	void deleteTaken();
 	bool isCD();
-	void placesetobject();
-	void placesetobject(uint8 index);
-	void removesetobject();
-	void removesetobject(uint8 index);
-	void showallfree();
-	void showallex();
-	bool finishedwalkingCPP();
-	void finishedwalking();
-	void checkone();
-	void checkone(uint8 x, uint8 y, uint8 *flag, uint8 *flagEx, uint8 *type, uint8 *flagX, uint8 *flagY);
-	void getflagunderp();
-	void getflagunderp(uint8 *flag, uint8 *flagEx);
-	void walkandexamine();
-	void obname();
-	void obname(uint8 command, uint8 commandType);
-	void delpointer();
-	void showblink();
-	void dumpblink();
-	void dumppointer();
-	void showpointer();
-	void animpointer();
-	void checkcoords();
-	void checkcoords(const RectWithCallback *rectWithCallbacks);
-	void readmouse();
+	void placeSetObject();
+	void placeSetObject(uint8 index);
+	void removeSetObject();
+	void removeSetObject(uint8 index);
+	void showAllFree();
+	void showAllEx();
+	bool finishedWalkingCPP();
+	void finishedWalking();
+	void checkOne();
+	void checkOne(uint8 x, uint8 y, uint8 *flag, uint8 *flagEx, uint8 *type, uint8 *flagX, uint8 *flagY);
+	void getFlagUnderP();
+	void getFlagUnderP(uint8 *flag, uint8 *flagEx);
+	void walkAndExamine();
+	void obName();
+	void obName(uint8 command, uint8 commandType);
+	void delPointer();
+	void showBlink();
+	void dumpBlink();
+	void dumpPointer();
+	void showPointer();
+	void animPointer();
+	void checkCoords();
+	void checkCoords(const RectWithCallback *rectWithCallbacks);
+	void readMouse();
 	uint16 readMouseState();
-	uint16 waitframes();
-	void drawflags();
-	void addtopeoplelist();
-	void addtopeoplelist(ReelRoutine *routine);
-	void getexpos();
-	void paneltomap();
-	void maptopanel();
-	void dumpmap();
-	void obpicture();
-	void transferinv();
-	void obicons();
+	uint16 waitFrames();
+	void drawFlags();
+	void addToPeopleList();
+	void addToPeopleList(ReelRoutine *routine);
+	void getExPos();
+	void panelToMap();
+	void mapToPanel();
+	void dumpMap();
+	void obPicture();
+	void transferInv();
+	void obIcons();
 	void compare();
 	bool compare(uint8 index, uint8 flag, const char id[4]);
-	bool pixelcheckset(const ObjPos *pos, uint8 x, uint8 y);
-	bool isitdescribed(const ObjPos *objPos);
-	void checkifset();
-	bool checkifset(uint8 x, uint8 y);
-	void checkifpathison();
-	bool checkifpathison(uint8 index);
-	void isitworn();
-	bool isitworn(const DynObject *object);
-	void wornerror();
-	void makeworn();
-	void makeworn(DynObject *object);
-	void obtoinv();
-	void obtoinv(uint8 index, uint8 flag, uint16 x, uint16 y);
-	void showryanpage();
-	void findallryan();
-	void findallryan(uint8 *inv);
-	void fillryan();
-	void useroutine();
-	void hangon();
-	void hangon(uint16 frameCount);
-	void hangonw();
-	void hangonw(uint16 frameCount);
-	void hangonp();
-	void hangonp(uint16 count);
-	void showicon();
-	uint8 findnextcolon(uint8 **string);
-	void findnextcolon();
-	uint8 *getobtextstartCPP();
-	void usetext(const uint8 *string);
-	void usetext();
-	void getblockofpixel();
-	uint8 getblockofpixel(uint8 x, uint8 y);
+	bool pixelCheckSet(const ObjPos *pos, uint8 x, uint8 y);
+	bool isItDescribed(const ObjPos *objPos);
+	void checkIfSet();
+	bool checkIfSet(uint8 x, uint8 y);
+	void checkIfPathIsOn();
+	bool checkIfPathIsOn(uint8 index);
+	void isItWorn();
+	bool isItWorn(const DynObject *object);
+	void wornError();
+	void makeWorn();
+	void makeWorn(DynObject *object);
+	void obToInv();
+	void obToInv(uint8 index, uint8 flag, uint16 x, uint16 y);
+	void showRyanPage();
+	void findAllRyan();
+	void findAllRyan(uint8 *inv);
+	void fillRyan();
+	void useRoutine();
+	void hangOn();
+	void hangOn(uint16 frameCount);
+	void hangOnW();
+	void hangOnW(uint16 frameCount);
+	void hangOnP();
+	void hangOnP(uint16 count);
+	void showIcon();
+	uint8 findNextColon(uint8 **string);
+	void findNextColon();
+	uint8 *getObTextStartCPP();
+	void useText(const uint8 *string);
+	void useText();
+	void getBlockOfPixel();
+	uint8 getBlockOfPixel(uint8 x, uint8 y);
 	void bresenhams();
-	void examineobtext();
-	void sortoutmap();
-	void showcity();
-	uint16 getpersframe(uint8 index);
-	void convicons();
-	void examineob(bool examineAgain = true);
-	void showwatch();
-	void dumpwatch();
-	void showtime();
-	void roomname();
-	void transfertext();
-	void initrain();
-	Rain *splitintolines(uint8 x, uint8 y, Rain *rain);
+	void examineObText();
+	void sortOutMap();
+	void showCity();
+	uint16 getPersFrame(uint8 index);
+	void convIcons();
+	void examineOb(bool examineAgain = true);
+	void showWatch();
+	void dumpWatch();
+	void showTime();
+	void roomName();
+	void transferText();
+	void initRain();
+	Rain *splitIntoLines(uint8 x, uint8 y, Rain *rain);
 	uint8 *mainPalette();
 	uint8 *startPalette();
 	uint8 *endPalette();
-	void clearstartpal();
-	void clearendpal();
-	void paltostartpal();
-	void endpaltostart();
-	void startpaltoend();
-	void paltoendpal();
-	void fadecalculation();
-	void watchcount();
-	void zoomicon();
-	void loadroom();
-	void getundermenu();
-	void putundermenu();
-	void textformonk();
-	void textforend();
-	void readsetdata();
-	void loadroomssample();
-	void fadeupyellows();
-	void fadeupmonfirst();
-	void printlogo();
-	void usemon();
-	void scrollmonitor();
-	void showcurrentfile();
+	void clearStartPal();
+	void clearEndPal();
+	void palToStartPal();
+	void endPalToStart();
+	void startPalToEnd();
+	void palToEndPal();
+	void fadeCalculation();
+	void watchCount();
+	void zoomIcon();
+	void loadRoom();
+	void getUnderMenu();
+	void putUnderMenu();
+	void textForMonk();
+	void textForEnd();
+	void readSetData();
+	void loadRoomsSample();
+	void fadeupYellows();
+	void fadeupMonFirst();
+	void printLogo();
+	void useMon();
+	void scrollMonitor();
+	void showCurrentFile();
 	void input();
-	void monprint();
-	const char *monprint(const char *string);
+	void monPrint();
+	const char *monPrint(const char *string);
 	Frame *tempGraphics();
 	Frame *tempGraphics2();
 	Frame *tempGraphics3();
-	void accesslighton();
-	void accesslightoff();
-	void randomaccess(uint16 count);
-	void randomaccess();
-	void monmessage(uint8 index);
-	void monmessage();
-	void neterror();
-	void turnonpower();
-	void powerlighton();
-	void powerlightoff();
-	void playchannel0();
-	void playchannel0(uint8 index, uint8 repeat);
-	void playchannel1();
-	void playchannel1(uint8 index);
-	void showmainops();
-	void showdiscops();
-	void createpanel();
-	void createpanel2();
-	void findroominloc();
-	void reelsonscreen();
+	void accessLightOn();
+	void accessLightOff();
+	void randomAccess(uint16 count);
+	void randomAccess();
+	void monMessage(uint8 index);
+	void monMessage();
+	void netError();
+	void turnOnPower();
+	void powerLightOn();
+	void powerLightOff();
+	void playChannel0();
+	void playChannel0(uint8 index, uint8 repeat);
+	void playChannel1();
+	void playChannel1(uint8 index);
+	void showMainOps();
+	void showDiscOps();
+	void createPanel();
+	void createPanel2();
+	void findRoomInLoc();
+	void reelsOnScreen();
 	void reconstruct();
 	void look();
-	void autolook();
-	void dolook();
-	void usetempcharset();
-	void usecharset1();
-	void getbackfromob();
-	void showfirstuse();
-	void showseconduse();
-	void actualsave();
-	void actualload();
-	void loadposition(unsigned int slot);
-	void saveposition(unsigned int slot, const uint8 *descbuf);
-	void openforsave(unsigned int slot);
-	void openforload(unsigned int slot);
+	void autoLook();
+	void doLook();
+	void useTempCharset();
+	void useCharset1();
+	void getBackFromOb();
+	void showFirstUse();
+	void showSecondUse();
+	void actualSave();
+	void actualLoad();
+	void loadPosition(unsigned int slot);
+	void savePosition(unsigned int slot, const uint8 *descbuf);
+	void openForSave(unsigned int slot);
+	void openForLoad(unsigned int slot);
 	uint16 allocateAndLoad(unsigned int size);
 	void clearAndLoad(uint16 seg, uint8 c, unsigned int size, unsigned int maxSize);
 	void loadRoomData(const Room* room, bool skipDat);
-	void restoreall();
-	void restorereels();
-	void viewfolder();
+	void restoreAll();
+	void restoreReels();
+	void viewFolder();
 	void checkFolderCoords();
-	void loadfolder();
-	void showfolder();
-	void showleftpage();
-	void showrightpage();
-	void nextfolder();
-	void lastfolder();
-	void folderhints();
-	void folderexit();
-	uint8 getlocation(uint8 index);
-	void getlocation();
-	void setlocation(uint8 index);
-	void setlocation();
+	void loadFolder();
+	void showFolder();
+	void showLeftPage();
+	void showRightPage();
+	void nextFolder();
+	void lastFolder();
+	void folderHints();
+	void folderExit();
+	uint8 getLocation(uint8 index);
+	void getLocation();
+	void setLocation(uint8 index);
+	void setLocation();
 	const uint8 *getTextInFile1(uint16 index);
-	void loadtemptext();
-	void loadtemptext(const char *fileName);
-	void loadtraveltext();
-	void drawfloor();
-	void allocatebuffers();
-	void worktoscreenm();
-	bool checkspeed(ReelRoutine *routine);
-	void checkspeed();
-	void sparkydrip(ReelRoutine &routine);
-	void othersmoker(ReelRoutine &routine);
+	void loadTempText();
+	void loadTempText(const char *fileName);
+	void loadTravelText();
+	void drawFloor();
+	void allocateBuffers();
+	void workToScreenM();
+	bool checkSpeed(ReelRoutine *routine);
+	void checkSpeed();
+	void sparkyDrip(ReelRoutine &routine);
+	void otherSmoker(ReelRoutine &routine);
 	void gamer(ReelRoutine &routine);
 	void eden(ReelRoutine &routine);
 	void sparky(ReelRoutine &routine);