Commit Graph

46 Commits

Author SHA1 Message Date
Johannes Schickel
bad7cdd3a6 SWORD25: Make GPL headers consistent in themselves. 2014-02-18 02:39:38 +01:00
Eugene Sandulenko
7a669b770f SWORD25: Specifying int size to make Amiga happy 2013-09-29 09:45:16 +03:00
Eugene Sandulenko
2a2a5e51c6 SWORD25: Fix Amiga compilation 2013-09-29 09:30:23 +03:00
Matthew Hoops
9539017ee3 ALL: initialise -> initialize 2011-05-25 11:17:11 -04:00
strangerke
69b1485a22 GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
Filippos Karapetis
42670975ac SWORD25: Removed a lot of debug/unimplemented/unused functions
svn-id: r55600
2011-01-28 20:52:52 +00:00
Filippos Karapetis
1250785822 SWORD25: Replaced BS_ASSERT() with assert()
svn-id: r55464
2011-01-23 15:01:24 +00:00
Filippos Karapetis
00a0f8d15d SWORD25: Removed the custom log class and replaced it with warning/error/debugC calls
svn-id: r55462
2011-01-23 14:49:50 +00:00
David Turner
7ad677afc8 SWORD25: Added basic debugging console to engine (Command Key Disabled)
Since SWORD25 uses Debug Channels, this allows for the interactive setting of debugflags as well as providing a base for adding further debugging commands.

However, this is not currently usable as the command key code is commented out.
This is due to the event loop which reads keyboard input being buried 2 object layers below the Engine VM object and I am unsure how the engine development team would want this exposed / interfaced.

svn-id: r54184
2010-11-10 04:30:24 +00:00
Max Horn
b2fa7e58a3 SWORD25: Start to rename read/write methods of *PersistenceBlock classes
All should be renamed to reduce risk of accidental incorrect use.

svn-id: r53899
2010-10-28 00:26:25 +00:00
Max Horn
7e1d78cab1 SWORD25: Simplify InputEngine::(un)persist
svn-id: r53897
2010-10-28 00:24:53 +00:00
Max Horn
aaf7ffdd5c SWORD25: Fix keyboard state handling
Previously, you could get the game into a state where it would think a
key was constantly being pressed. E.g. by pressing 'p' several times
quickly in a row, the game would end in a state where it endlessly
toggled between pause mode and regular mode.

svn-id: r53878
2010-10-27 15:53:53 +00:00
Max Horn
95353b0e60 SWORD25: Use ScummVM keycodes
This should enable use of F-keys in BS25. Most of the KEY_*
constants are not used by the scripts anyway.

svn-id: r53877
2010-10-27 15:53:36 +00:00
Max Horn
b5e41b3a82 SWORD25: Fix out of bounds writes when pressing keys like ctrl or F-keys
This fixes a crash one got by quitting via the GMM.

svn-id: r53876
2010-10-27 15:15:59 +00:00
Max Horn
e761f76653 SWORD25: Get rid of most of the 'kernel service/superclass' code
svn-id: r53835
2010-10-25 22:41:25 +00:00
Max Horn
90dcc8c91a SWORD25: Get rid of classes ScummVMWindow and Window
svn-id: r53832
2010-10-25 21:51:11 +00:00
Max Horn
360f67636b SWORD25: Register LUA callbacks insider registerScriptBindings() methods
Previously, the constructor of an anonymous global object was used to do
this, for no apparent reason.
However, maybe there was a hidden reason which I missed, so this change
might cause regressions. I.e., please test.

svn-id: r53735
2010-10-23 15:44:33 +00:00
Max Horn
c483a22f2a SWORD25: Get rid of global SharedPtr instances
svn-id: r53734
2010-10-23 15:44:04 +00:00
Eugene Sandulenko
6629efc676 SWORD25: Enforced code formatting rules in rest of the engine
svn-id: r53626
2010-10-19 21:03:33 +00:00
Eugene Sandulenko
3feac393b0 SWORD25: Renamed Lua .c files to .cpp and make it compilable
svn-id: r53568
2010-10-18 17:12:00 +00:00
Max Horn
550073ee04 SWORD25: Do not use Kernel::GetService directly anymore
svn-id: r53477
2010-10-15 12:18:19 +00:00
Johannes Schickel
bc2781fdb3 SWORD25: Semi-colon cleanup.
svn-id: r53446
2010-10-13 20:04:50 +00:00
Max Horn
8f4f0d16fc SWORD25: Renamed getInstance() -> instance()
svn-id: r53430
2010-10-13 15:41:00 +00:00
Eugene Sandulenko
54ccc8f4c9 SWORD25: Enforced code naming conventions in script/*
svn-id: r53391
2010-10-13 00:08:28 +00:00
Eugene Sandulenko
c59603ddba SWORD25: Get rid of ScummVMInput class
svn-id: r53354
2010-10-12 23:50:19 +00:00
Eugene Sandulenko
06bce68860 SWORD25: Comply to the code conventions for several classes
svn-id: r53310
2010-10-12 23:32:32 +00:00
Eugene Sandulenko
086f5961b6 SWORD25: unsigned int -> uint
svn-id: r53309
2010-10-12 23:30:00 +00:00
Eugene Sandulenko
0cdb2ded85 SWORD25: unsigned char -> byte
svn-id: r53308
2010-10-12 23:26:48 +00:00
Eugene Sandulenko
b01994a53b SWORD25: removed BS_ prefix from rest of the classes.
The things which are intentionally left with the prefix:
BS_LOG, BS_ASSERT, BS_Rect, BS_String.

svn-id: r53261
2010-10-12 22:59:01 +00:00
Eugene Sandulenko
be44216e5c SWORD25: eliminated BS_ prefix in all but kernel/
svn-id: r53259
2010-10-12 22:55:59 +00:00
Eugene Sandulenko
e71337861f SWORD25: brought CallBackRegisry class to our naming standards
svn-id: r53257
2010-10-12 22:51:37 +00:00
Eugene Sandulenko
a1d22a063b SWORD25: Fix warnings
svn-id: r53254
2010-10-12 22:50:28 +00:00
Eugene Sandulenko
031a2fc88e SWORD25: Final linking fixes. Now it links!
svn-id: r53234
2010-10-12 22:42:44 +00:00
Eugene Sandulenko
ad5b74c9de SWORD25: Clean compile!
Under MinGW, with OpenGL and tinyxml.

svn-id: r53225
2010-10-12 22:38:23 +00:00
Eugene Sandulenko
47904bc7b2 SWORD25: Mass-astyle.
svn-id: r53222
2010-10-12 22:35:55 +00:00
Paul Gilbert
87553862d9 SWORD25: Converted remainder of Kernel/ folder
svn-id: r53216
2010-10-12 22:28:21 +00:00
Paul Gilbert
49ea23c532 SWORD25: Fix for void * conversion errors
It turns out that strict C++ doesn't allow function pointers to be converted to void pointers and vice versa. Since there are two callback function pointer types - one with a KEY_COMMANDS enum parameter, and the other with an unsigned char type, I changed all void * occurances to a function pointer type with an 'int' parameter, and changed all implementation methods to take in an int parameter.

svn-id: r53208
2010-10-12 22:23:24 +00:00
Paul Gilbert
8533538c83 SWORD25: Mostly converted input/inputengine_script.cpp
I have the same problem with this file as inputengine.cpp.. I'm getting errors converting between 'void *' and CommandCallback function pointers.

svn-id: r53205
2010-10-12 22:22:03 +00:00
Paul Gilbert
86bef1508c SWORD25: Converted the input engine to use the ScummVM event manager
svn-id: r53203
2010-10-12 22:21:24 +00:00
Paul Gilbert
56d82aade1 SWORD25: Converted inputengine.cpp
svn-id: r53200
2010-10-12 22:19:03 +00:00
Paul Gilbert
2006e564a1 SWORD25: Moved the Lua library into it's own namespace
Previously with some of the files I was leaving the #include references to the library inside the global namespace. However, since the engine itself is now inside a namespace, I had to do a lot of changes, such as lua_State to ::lua_State. This way is cleaner, and I just need to add a 'using namespace Lua' where needed.

svn-id: r53198
2010-10-12 22:18:35 +00:00
Eugene Sandulenko
293bf95c01 SWORD25: Replacing headers with ScummVM ones plus original (C)
svn-id: r53188
2010-10-12 22:13:00 +00:00
Paul Gilbert
e78b19a650 SWORD25: Converted kernel/kernel.cpp to compile under ScummVM
This commit creates a skeleton detection and engine class, as well as code necessary to call the kernel initiation.
The kernel/kernel.cpp has been converted to compile under ScummVM, along with all dependant header files.

svn-id: r53184
2010-10-12 21:55:38 +00:00
Eugene Sandulenko
69b618a8f5 SWORD25: Compilation fixes
Majority of files now compile under Windoze.

svn-id: r53182
2010-10-12 21:54:21 +00:00
Eugene Sandulenko
65da804f58 SWORD25: Path fixes for includes
svn-id: r53180
2010-10-12 21:49:51 +00:00
Eugene Sandulenko
a683a420a9 SWORD25: Importing original sources
svn-id: r53171
2010-10-12 21:38:20 +00:00