[Scummvm-cvs-logs] scummvm master -> 363b23f55d3bf143f1c3221fc6ea7d523bb06ea1

[clone2727]

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

Summary:
159f2128bb DRACI: Silence warning
363b23f55d MOHAWK: Use properly cased names for Riven variables


Commit: 159f2128bb21fb1675a45ef1cdf46ba04f1e9cac
    https://github.com/scummvm/scummvm/commit/159f2128bb21fb1675a45ef1cdf46ba04f1e9cac
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2014-05-03T14:47:04-04:00

Commit Message:
DRACI: Silence warning

Changed paths:
    engines/draci/walking.cpp



diff --git a/engines/draci/walking.cpp b/engines/draci/walking.cpp
index 6914898..04cd929 100644
--- a/engines/draci/walking.cpp
+++ b/engines/draci/walking.cpp
@@ -453,7 +453,7 @@ void WalkingState::callback() {
 	_callback = NULL;
 	_vm->_script->runWrapper(originalCallback, _callbackOffset, true, false);
 	_callbackLast = NULL;
-	_callbackOffset = NULL;
+	_callbackOffset = 0;
 }
 
 void WalkingState::callbackLast() {


Commit: 363b23f55d3bf143f1c3221fc6ea7d523bb06ea1
    https://github.com/scummvm/scummvm/commit/363b23f55d3bf143f1c3221fc6ea7d523bb06ea1
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2014-05-03T15:10:13-04:00

Commit Message:
MOHAWK: Use properly cased names for Riven variables

Changed paths:
    engines/mohawk/riven_vars.cpp



diff --git a/engines/mohawk/riven_vars.cpp b/engines/mohawk/riven_vars.cpp
index 1cd748d..efb9c1c 100644
--- a/engines/mohawk/riven_vars.cpp
+++ b/engines/mohawk/riven_vars.cpp
@@ -31,240 +31,240 @@ namespace Mohawk {
 
 static const char *variableNames[] = {
 	// aspit
-	"aatrusbook",
-	"aatruspage",
-	"acathbook",
-	"acathpage",
-	"acathstate",
-	"adoit",
-	"adomecombo",
-	"agehn",
-	"ainventory",
-	"aova",
-	"apower",
-	"araw",
-	"atemp",
-	"atrap",
-	"atrapbook",
-	"auservolume",
-	"azip",
+	"aAtrusBook",
+	"aAtrusPage",
+	"aCathBook",
+	"aCathPage",
+	"aCathState",
+	"aDoIt",
+	"aDomeCombo",
+	"aGehn",
+	"aInventory",
+	"aOva",
+	"aPower",
+	"aRaw",
+	"aTemp",
+	"aTrap",
+	"aTrapBook",
+	"aUserVolume",
+	"aZip",
 
 	// bspit
-	"bbacklock",
-	"bbait",
-	"bbigbridge",
-	"bbirds",
-	"bblrarm",
-	"bblrdoor",
-	"bblrgrt",
-	"bblrsw",
-	"bblrvalve",
-	"bblrwtr",
-	"bbook",
-	"bbrlever",
-	"bcavedoor",
+	"bBackLock",
+	"bBait",
+	"bBigBridge",
+	"bBirds",
+	"bBlrArm",
+	"bBlrDoor",
+	"bBlrGrt",
+	"bBlrSw",
+	"bBlrValve",
+	"bBlrWtr",
+	"bBook",
+	"bBrLever",
+	"bCaveDoor",
 	"bcombo",
-	"bcpipegr",
-	"bcratergg",
-	"bdome",
-	"bdrwr",
-	"bfans",
-	"bfmdoor",
-	"bidvlv",
-	"blab",
-	"blabbackdr",
-	"blabbook",
-	"blabeye",
-	"blabfrontdr",
-	"blabpage",
-	"blever",
-	"bfrontlock",
-	"bheat",
-	"bmagcar",
-	"bpipdr",
-	"bprs",
-	"bstove",
-	"btrap",
-	"bvalve",
-	"bvise",
-	"bytram",
-	"bytramtime",
-	"bytrap",
-	"bytrapped",
+	"bCPipeGr",
+	"bCraterGg",
+	"bDome",
+	"bDrwr",
+	"bFans",
+	"bFMDoor",
+	"bIdVlv",
+	"bLab",
+	"bLabBackDr",
+	"bLabBook",
+	"bLabEye",
+	"bLabFrontDr",
+	"bLabPage",
+	"bLever",
+	"bFrontLock",
+	"bHeat",
+	"bMagCar",
+	"bPipDr",
+	"bPrs",
+	"bStove",
+	"bTrap",
+	"bValve",
+	"bVise",
+	"bYtram",
+	"bYtramTime",
+	"bYtrap",
+	"bYtrapped",
 
 	// gspit
-	"gbook",
-	"gcathtime",
-	"gcathstate",
-	"gcombo",
-	"gdome",
-	"gemagcar",
-	"gimagecurr",
+	"gBook",
+	"gCathTime",
+	"gCathState",
+	"gCombo",
+	"gDome",
+	"gEmagCar",
+	"gImageCurr",
 	"gimagemax",
-	"gimagerot",
-	"glkbtns",
-	"glkbridge",
-	"glkelev",
-	"glview",
-	"glviewmpos",
-	"glviewpos",
-	"gnmagrot",
-	"gnmagcar",
-	"gpinup",
-	"gpinpos",
-	"gpinsmpos",
-	"grview",
-	"grviewmpos",
-	"grviewpos",
-	"gscribe",
-	"gscribetime",
-	"gsubelev",
-	"gsubdr",
-	"gupmoov",
-	"gwhark",
-	"gwharktime",
+	"gImageRot",
+	"gLkBtns",
+	"gLkBridge",
+	"gLkElev",
+	"gLView",
+	"gLViewMPos",
+	"gLViewPos",
+	"gNmagRot",
+	"gNmagCar",
+	"gPinUp",
+	"gPinPos",
+	"gPinsMPos",
+	"gRView",
+	"gRViewMPos",
+	"gRViewPos",
+	"gScribe",
+	"gScribeTime"
+	"gSubElev",
+	"gSubDr",
+	"gUpMoov",
+	"gWhark",
+	"gWharkTime",
 
 	// jspit
-	"jwmagcar",
-	"jbeetle",
-	"jbeetlepool",
-	"jbook",
-	"jbridge1",
-	"jbridge2",
-	"jbridge3",
-	"jbridge4",
-	"jbridge5",
-	"jccb",
-	"jcombo",
-	"jcrg",
-	"jdome",
-	"jdrain",
-	"jgallows",
-	"jgate",
-	"jgirl",
-	"jiconcorrectorder",
-	"jiconorder",
-	"jicons",
-	"jladder",
-	"jleftpos",
-	"jpeek",
-	"jplaybeetle",
-	"jprebel",
-	"jprisondr",
-	"jprisonsecdr",
-	"jrbook",
-	"jrightpos",
-	"jsouthpathdr",
-	"jschooldr",
-	"jsub",
-	"jsubdir",
-	"jsubhatch",
-	"jsubsw",
-	"jsunners",
-	"jsunnertime",
-	"jthronedr",
-	"jtunneldr",
-	"jtunnellamps",
-	"jvillagepeople",
-	"jwarning",
-	"jwharkpos",
-	"jwharkram",
-	"jwmouth",
-	"jwmagcar",
-	"jymagcar",
+	"jWMagCar",
+	"jBeetle",
+	"jBeetlePool",
+	"jBook",
+	"jBridge1",
+	"jBridge2",
+	"jBridge3",
+	"jBridge4",
+	"jBridge5",
+	"jCCB",
+	"jCombo",
+	"jCrg",
+	"jDome",
+	"jDrain",
+	"jGallows",
+	"jGate",
+	"jGirl",
+	"jIconCorrectOrder",
+	"jIconOrder",
+	"jIcons",
+	"jLadder",
+	"jLeftPos",
+	"jPeek",
+	"jPlayBeetle",
+	"jPRebel",
+	"jPrisonDr",
+	"jPrisonSecDr",
+	"jrBook",
+	"jRightPos",
+	"jSouthPathDr",
+	"jSchoolDr",
+	"jSub",
+	"jSubDir",
+	"jSubHatch",
+	"jSubSw",
+	"jSunners",
+	"jSunnerTime",
+	"jThroneDr",
+	"jTunnelDr",
+	"jTunnelLamps",
+	"jVillagePeople",
+	"jWarning",
+	"jWharkPos",
+	"jWharkRam",
+	"jWMouth",
+	"jWMagCar",
+	"jYMagCar",
 
 	// ospit
 	"oambient",
-	"obutton",
+	"oButton",
 	"ocage",
-	"odeskbook",
-	"ogehnpage",
-	"omusicplayer",
-	"ostanddrawer",
-	"ostove",
+	"oDeskBook",
+	"oGehnPage",
+	"oMusicPlayer",
+	"oStandDrawer",
+	"oStove",
 
 	// pspit
-	"pbook",
-	"pcage",
-	"pcathcheck",
-	"pcathstate",
-	"pcathtime",
-	"pcombo",
-	"pcorrectorder",
+	"pBook",
+	"pCage",
+	"pCathCheck",
+	"pCathState",
+	"pCathTime",
+	"pCombo",
+	"pCorrectOrder",
 	"pdome",
-	"pelevcombo",
-	"pleftpos",
-	"prightpos",
-	"ptemp",
-	"pwharkpos",
+	"pElevCombo",
+	"pLeftPos",
+	"pRightPos",
+	"pTemp",
+	"pWharkPos",
 
 	// rspit
-	"rrebel",
-	"rrebelview",
-	"rrichard",
-	"rvillagetime",
+	"rRebel",
+	"rRebelView",
+	"rRichard",
+	"rVillageTime",
 
 	// tspit
-	"tbars",
-	"tbeetle",
-	"tblue",
-	"tbook",
-	"tbookvalve",
-	"tcage",
-	"tcombo",
-	"tcorrectorder",
-	"tcovercombo",
-	"tdl",
-	"tdome",
-	"tdomeelev",
-	"tdomeelevbtn",
-	"tgatebrhandle",
-	"tgatebridge",
-	"tgatestate",
-	"tgreen",
-	"tgridoor",
-	"tgrodoor",
-	"tgrmdoor",
-	"tguard",
-	"timagedoor",
-	"tmagcar",
-	"torange",
-	"tred",
-	"tsecdoor",
-	"tsubbridge",
-	"ttelecover",
-	"ttelehandle",
-	"ttelepin",
-	"ttelescope",
-	"ttelevalve",
-	"ttemple",
-	"ttempledoor",
-	"ttunneldoor",
-	"tviewer",
-	"tviolet",
-	"twabrvalve",
-	"twaffle",
-	"tyellow",
+	"tBars",
+	"tBeetle",
+	"tBlue",
+	"tBook",
+	"tBookValve",
+	"tCage",
+	"tCombo",
+	"tCorrectOrder",
+	"tCoverCombo",
+	"tDL",
+	"tDome",
+	"tDomeElev",
+	"tDomeElevBtn",
+	"tGateBrHandle",
+	"tGateBridge",
+	"tGateState",
+	"tGreen",
+	"tGRIDoor",
+	"tGRODoor",
+	"tGRMDoor",
+	"tGuard",
+	"tImageDoor",
+	"tMagCar",
+	"tOrange",
+	"tRed",
+	"tSecDoor",
+	"tSubBridge",
+	"tTeleCover",
+	"tTeleHandle",
+	"tTelePin",
+	"tTelescope",
+	"tTeleValve",
+	"tTemple",
+	"tTempleDoor",
+	"tTunnelDoor",
+	"tViewer",
+	"tViolet",
+	"tWaBrValve",
+	"tWaffle",
+	"tYellow",
 
 	// Miscellaneous
 	"elevbtn1",
 	"elevbtn2",
 	"elevbtn3",
-	"domecheck",
-	"transitionsenabled",
-	"transitionmode",
-	"waterenabled",
-	"rivenambients",
-	"stackvarsinitialized",
-	"doingsetupscreens",
+	"domeCheck",
+	"transitionsEnabled",
+	"transitionMode",
+	"waterEnabled",
+	"RivenAmbients",
+	"stackVarsInitialized",
+	"DoingSetupScreens",
 	"all_book",
-	"playerhasbook",
-	"returnstackid",
-	"returncardid",
-	"newpos",
-	"themarble",
-	"currentstackid",
-	"currentcardid"
+	"playerHasBook",
+	"returnStackID",
+	"returnCardID",
+	"NewPos",
+	"theMarble",
+	"CurrentStackID",
+	"CurrentCardID"
 };
 
 uint32 &MohawkEngine_Riven::getStackVar(uint32 index) {