aboutsummaryrefslogtreecommitdiff
path: root/engines/cine/various.cpp
AgeCommit message (Collapse)Author
2010-01-25Strip trailing spaces/tabs.Johannes Schickel
svn-id: r47541
2010-01-24Cine: executePlayerInput: Operation Stealth: Fix target object name not ↵Kari Salminen
disappearing when passing over an empty area with a verb already chosen. svn-id: r47519
2010-01-24Cine: executePlayerInput: Fix broken Y-movement in Operation Stealth (D'oh! ↵Kari Salminen
Copy-pasted X to where Y was meant :-P). - Hopefully NOW things should work without r33872! svn-id: r47518
2010-01-24Cine: executePlayerInput: Add TODO about investigating why some buttons ↵Kari Salminen
don't work currently. svn-id: r47517
2010-01-24Cine: executePlayerInput: Revert r33872 as things should work without it now.Kari Salminen
With the latest changes to executePlayerInput we should now be able to free the girl at the bottom of the ocean without the r33872. The commit log from r33872 was: "Fix for bugging moving at the bottom of the ocean when trying to free the girl from the ropes and swimming to the surface. Some global variables related to mouse position weren't being updated in executePlayerInput, now they are and things seem to work. Also enables moving in the labyrinth arcade sequence at the palace." svn-id: r47516
2010-01-24Cine: executePlayerInput: Add makeActionMenu-part to keyboard handling and a ↵Kari Salminen
couple of TODOs for Operation Stealth. - NOTE: This doesn't seem to work correctly yet. My current guess is that it has to do with how some keyboard events are handled in cine/main_loop.cpp's processEvent-function and some in cine/various.cpp's executePlayerInput. svn-id: r47515
2010-01-24Cine: executePlayerInput: Implement moving using keyboard for Operation Stealth.Kari Salminen
svn-id: r47513
2010-01-24Cine: executePlayerInput: Implement 'A player command is given, left mouse ↵Kari Salminen
button is down, right mouse button is up'-case for Operation Stealth. - Also changed a do-while -loop into a while-loop as it should be for both FW and OS according to disassembly. svn-id: r47512
2010-01-24Cine: executePlayerInput: Fix 'No player command is given, left mouse button ↵Kari Salminen
is down, right mouse button is up'-case for Operation Stealth. svn-id: r47510
2010-01-24Cine: executePlayerInput: Fix 'left and right mouse buttons are up'-case for ↵Kari Salminen
Operation Stealth. svn-id: r47509
2010-01-24Cine: executePlayerInput: Combine 'left mouse button is up, right mouse ↵Kari Salminen
button is down'-cases into one code part. Additionally: - Operation Stealth specific: Make makeActionMenu() use canUseOnItemTable. This would seem to be the correct way according to disassembly (Although there is of course a possibility that I have overlooked some part of the code). svn-id: r47508
2010-01-24Cine: executePlayerInput: Name used keys in switch-clause (F1-F10, Ins, Del).Kari Salminen
svn-id: r47507
2010-01-24Cine: executePlayerInput: Combine mouse handling plus a few other things.Kari Salminen
- Combines mouse position and button state fetching from two branches (allowPlayerInput / !allowPlayerInput) into a single loop with a little more exotic while-clause. NOTE! Added manageEvents-call into the unified version although there was no manageEvents-call in one of the versions that was combined. Tested a little and didn't seem to matter, but hopefully won't cause any regressions! - Limit first possible 'renderer->setCommand(commandBuffer)' call to Future Wars only (Checked with FW & OS disassembly). - Combined all cases of 'left and right mouse buttons are down' into a single if-clause (All those cases call makeSystemMenu). svn-id: r47505
2010-01-24Cine: Document branches in executePlayerInput and remove dead code ↵Kari Salminen
(if-clauses that are always true or always false). svn-id: r47503
2010-01-24Cine: Cleanup (Use an enumeration for mouse button states rather than values ↵Kari Salminen
1 and 2). svn-id: r47502
2009-11-02Changed foo(void) to foo() in almost all non-backend source filesMax Horn
svn-id: r45616
2009-10-08Change doxygen inline comments from "//!" to "///" as proposed on -develMax Horn
svn-id: r44802
2009-09-22Implement menu stack to support all menu color effects, specific to the ↵Johannes Schickel
Amiga version of the game. svn-id: r44263
2009-09-21Changed AMIGA menu code to closer match the original. (The menu item ↵Johannes Schickel
highlight selection is still wrong though.) svn-id: r44231
2009-09-21Add more shouldQuit checks in event loops.Johannes Schickel
svn-id: r44230
2009-06-27Name Operation Stealth's global variables 251 and 252 and init them in main ↵Kari Salminen
loop. These are used as a sort of a backup for the mouse position (x, y) variables 249 and 250. Future Wars's VAR_MOUSE_Y_MODE and Operation Stealth's VAR_MOUSE_X_POS_2ND (251) clash and that's possibly why executePlayerInput currently works incorrectly with Operation Stealth. More reverse engineering is needed... svn-id: r41915
2009-05-11Fix bug #2055836: "FW: Music is not restarted when loading a saved game"Eugene Sandulenko
svn-id: r40465
2009-01-01Whoa! Removing trailing spaces.Eugene Sandulenko
svn-id: r35648
2008-11-13Started moving Save/Load code to saveload.cpp/.hFilippos Karapetis
svn-id: r35033
2008-11-12Saving and loading from the GMM is now supported in the cine engineFilippos Karapetis
svn-id: r35031
2008-10-06Added new type Engine::Feature; pushed down some #include dependenciesMax Horn
svn-id: r34755
2008-09-13Big patch changing the signature of various Stream methods (some ports may ↵Max Horn
need to be slightly tweaked to fix overloading errors/warnings) svn-id: r34514
2008-09-01Merging more of the GSoC 2008 RTL branch: CINEMax Horn
svn-id: r34244
2008-08-21Fix typo.Kari Salminen
svn-id: r34084
2008-08-16Merged revisions ↵Christopher Page
33777,33781-33788,33790,33792-33793,33795,33797,33805,33807-33812,33815-33817,33819,33822,33826,33829,33837,33839,33844,33847,33858-33861,33864,33871-33873,33875,33877-33879,33886,33889-33892,33894,33896,33900,33902-33903,33919 via svnmerge from https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk svn-id: r33924
2008-08-14Fix for bugging moving at the bottom of the ocean when trying to free the ↵Kari Salminen
girl from the ropes and swimming to the surface. Some global variables related to mouse position weren't being updated in executePlayerInput, now they are and things seem to work. Also enables moving in the labyrinth arcade sequence at the palace. svn-id: r33872
2008-08-12Implemented Operation Stealth's makeCommandLine.Kari Salminen
svn-id: r33805
2008-08-12Implemented Operation Stealth specific parts of processInventory and added ↵Kari Salminen
another mouse button waiting loop into the function's end (It's in both Future Wars and Operation Stealth). Fixes inventory showing in Operation Stealth. svn-id: r33795
2008-08-12Changed commandBuffer from a char[80] to Common::String and made ↵Kari Salminen
FWRenderer::setCommand use a Common::String. Hopefully this might help with the command buffer overflow stuff, although this isn't a fix for the problem behind it, just a bandaid. svn-id: r33793
2008-08-10Merged revisions ↵Christopher Page
33719,33721-33723,33725-33727,33729-33730,33733,33736,33742,33754,33756,33758,33761,33763,33766 via svnmerge from https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk svn-id: r33769
2008-08-09Converted zoneData and zoneQuery tables from plain array types to ↵Kari Salminen
Common::Array. Should help catch out of bounds access errors that may cause memory corruption. svn-id: r33727
2008-08-09Converted objectTable from a plain array to a Common::Array. Should help to ↵Kari Salminen
catch out of bounds access errors that may cause memory corruption. svn-id: r33725
2008-08-09Merged revisions ↵Christopher Page
33632-33633,33635,33637,33639-33640,33642-33645,33648,33654-33655,33664,33667-33670,33673-33674,33678,33682,33686-33691,33693,33696,33698,33700,33703,33708,33710,33712-33714,33716 via svnmerge from https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk svn-id: r33720
2008-08-08Added basic moving using keyboard (Only works in Operation Stealth at the ↵Kari Salminen
moment): - Should make it possible to complete the first arcade sequence legitimately Renamed input variables (Their names were mixed up between Future Wars and Operation Stealth): - Future Wars's inputVar1 -> egoMovedWithKeyboard - Future Wars's inputVar2 -> xMoveKeyb - Future Wars's inputVar3 -> yMoveKeyb - Operation Stealth's inputVar0 -> xMoveKeyb - Operation Stealth's inputVar1 -> yMoveKeyb svn-id: r33698
2008-08-07Fix for popup boxes sometimes blocking animation when they shouldn't in ↵Kari Salminen
Operation Stealth: - Made waitForPlayerClick updating more like in the original. - Moved removeMessages to after the frame drawing in main loop hoping to be more like the original. - Added an additional test to Operation Stealth's implementation of overlay type 2 drawing. - Added an additional parameter incrementing and testing to Operation Stealth's removeMessages. Hopefully this won't cause any regressions in Future Wars! svn-id: r33686
2008-08-05Fix prompt updating regression introduced in r32257:Kari Salminen
Previously prompt didn't get updated all the time, like e.g. when selecting EXAMINE and moving the cursor over to DOOR and then moving the cursor to a place where there was no selectable object. The prompt would've still shown "EXAMINE DOOR", now it shows just "EXAMINE" which is correct AFAIK. svn-id: r33637
2008-08-04Merged revisions ↵Christopher Page
33188-33189,33191-33193,33196,33198,33202-33203,33206,33210,33212,33218-33220,33222,33224-33226,33229-33243,33246,33248-33250,33252,33258-33261,33263,33266,33270,33272-33283,33285,33287-33290,33295-33298,33321,33325-33330,33332-33335,33337-33340,33342,33345,33347,33349-33350,33352-33357,33359-33367,33369-33371,33373,33375-33377,33379-33380,33383-33385,33387-33389,33392-33394,33400-33402,33404-33405,33407-33410,33412-33416,33418-33419,33425-33427,33432,33436-33438,33444,33446,33452-33453,33455-33459,33463-33464,33466-33471,33473-33474,33478,33490,33492,33495-33496,33509-33512,33518-33519,33522-33527,33529-33530,33537,33541,33544,33546,33550,33552-33554,33556,33558,33561-33562,33565,33568,33570,33574,33576,33578-33581,33584-33587,33590,33596,33604-33611,33614-33615,33617-33618,33620-33621 via svnmerge from https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk svn-id: r33624
2008-08-04Fix for misplaced objects in mouse object selection (Operation Stealth ↵Kari Salminen
specific). - Implemented Operation Stealth specific part of getObjectUnderCursor which handles negative frame values. - Fixed a test case (Should test for ydif <= 0 although tested for ydif < 0). - Made part-value be anded with 0x0F in a test case to comply with disassembly. - Added comment about a test case which isn't present in the disassembly. Removing it makes things crash sometimes so letting it be. svn-id: r33620
2008-07-30Debug printing a couple more relevant variables in addAni.Kari Salminen
svn-id: r33446
2008-07-30Added some debug aids related to addAni and the processSeqList crashing.Kari Salminen
svn-id: r33444
2008-07-29Added purgeSeqList function (Used in mainloop now). Let's see if this helps ↵Kari Salminen
any... Renamed functions: * addScriptToList0 -> addScriptToGlobalScripts * executeList0 -> executeGlobalScripts * executeList1 -> executeObjectScripts * purgeList1 -> purgeObjectScripts (Also added a clarifying TODO to this function) * purgeList0 -> purgeGlobalScripts (Also added a clarifying TODO to this function) svn-id: r33409
2008-07-29Added a debug message to loadTempSaveOS's to check whether we loaded the ↵Kari Salminen
whole savefile. Made objectStruct's clearing also clear x and y member variables in resetEngine. svn-id: r33407
2008-07-29Rearranged parts of the Operation Stealth savegame loading routine.Kari Salminen
- Emulating the Future Wars savegame loading routine and hoping for the best. - Fixes an array out of bounds access when loading the global scripts. Now the loading crashes in the mainloop in processSeqList! But at least we got a bit farther this time. More fixing to come... svn-id: r33404
2008-07-28Fixing 'warning: comparison of unsigned expression < 0 is always false'Max Horn
svn-id: r33383
2008-07-28Added loading of temporary Operation Stealth savegames. Needs testing!Kari Salminen
- Music related settings and adBgVar0 & adBgVar1 aren't loaded currently. Modified resetEngine to also reset more of the Operation Stealth specific variables. Added getter for background scrolling value. Changed additional background indices 1 & 2 from byte to uint16. Made savegame loading functions return !in.ioFailed() as return value instead of true as previously. svn-id: r33379