Commit Graph

405 Commits

Author SHA1 Message Date
Arnaud Boutonné
1da44acae3 HUGO: Implement REMAPPAL.
Palettes in H3 Win intro are now correct

svn-id: r54100
2010-11-06 09:59:07 +00:00
Arnaud Boutonné
6b88fd44c0 HUGO: Silent GCC warning introduced in r54087
svn-id: r54095
2010-11-05 12:36:20 +00:00
Arnaud Boutonné
85513b2040 HUGO: Suppress useless case in processRoute()
svn-id: r54087
2010-11-05 08:36:37 +00:00
Arnaud Boutonné
913afa041a HUGO: Suppress status variables related to playback
svn-id: r54086
2010-11-05 08:14:12 +00:00
Arnaud Boutonné
749d2afd1f TOOL: Fix bug in data in Hugo2 Dos
svn-id: r54085
2010-11-05 07:59:55 +00:00
Arnaud Boutonné
bf787323ab TOOL: Fix ticks per seconds for H1 Dos
svn-id: r54063
2010-11-04 12:29:06 +00:00
Arnaud Boutonné
4246afcb0e HUGO: Fix 'exit' command in DOS versions
svn-id: r54054
2010-11-03 23:56:34 +00:00
Arnaud Boutonné
c6ddf22057 HUGO: Fix typo... sorry
svn-id: r54044
2010-11-02 23:22:25 +00:00
Arnaud Boutonné
ffa455bef9 HUGO: Fix cypher for v1 Dos
svn-id: r54043
2010-11-02 23:16:28 +00:00
Max Horn
3d5e2fa820 HUGO: Replace Utils::Warn() by warning()
svn-id: r54021
2010-11-01 20:40:33 +00:00
Arnaud Boutonné
7d09121c71 HUGO: Fix typo
svn-id: r54019
2010-11-01 20:21:01 +00:00
Arnaud Boutonné
e0fec60874 HUGO: Convert class member comments to Doxygen format
svn-id: r54018
2010-11-01 20:20:21 +00:00
Max Horn
e27b05ef35 COMMON: Rename String::printf() to String::format()
This is a first step towards getting rid of all uses of regular printf,
fprintf, vprintf, vfprintf, puts, fputs, etc. in our codebase.

The name format() reflects the purpose of the function, and parallels
String.format() in Java, boost::format, and others.

svn-id: r54004
2010-11-01 16:02:28 +00:00
Arnaud Boutonné
4c6eb76d79 HUGO: Make some scheduler functions and variables protected
svn-id: r53999
2010-11-01 15:29:06 +00:00
Arnaud Boutonné
e48cdb378c HUGO: Move _actListArr to scheduler
svn-id: r53995
2010-11-01 00:27:11 +00:00
Arnaud Boutonné
f757d489a0 HUGO: Suppress Playback code
Also change 3 variable types in order to match types used 
in create_hugo 

svn-id: r53987
2010-10-31 21:20:22 +00:00
Max Horn
9995c7bd98 HUGO: Comment out all occurrences of FILE *fpb
These are not portable, and (at least in the current code)
do nothing useful either: a file is opened, and closed again,
in write mode. At most this may create / delete the file.
But since the method containing this code is never called...

svn-id: r53957
2010-10-30 21:25:30 +00:00
Arnaud Boutonné
6c702094a8 HUGO: Free some more memory before exiting
- suppress two useless variables
- initialize some variables

svn-id: r53956
2010-10-30 20:48:54 +00:00
Arnaud Boutonné
724a702fdf HUGO: Free memory on exit
svn-id: r53945
2010-10-30 16:04:43 +00:00
Arnaud Boutonné
c4d4277807 HUGO: Add specific schedulers for each DOS version.
This fixes intro (and game) in H3 DOS, general game 
behavior in H2 Dos. H1 Dos is still broken.

svn-id: r53858
2010-10-26 21:16:16 +00:00
Arnaud Boutonné
b42faf72e8 HUGO: Add specific versions of doAction() for Dos versions
svn-id: r53831
2010-10-25 19:59:32 +00:00
Arnaud Boutonné
f4ae774751 HUGO: Add a debug channel for Object functions
svn-id: r53826
2010-10-25 14:03:01 +00:00
Arnaud Boutonné
35f220ace2 HUGO: cleanup: Suppress trailing spaces and tabs
svn-id: r53825
2010-10-25 13:31:01 +00:00
Arnaud Boutonné
4e9a2798ef HUGO: Fix display priority order in H1 Dos
svn-id: r53823
2010-10-25 13:20:15 +00:00
Arnaud Boutonné
8e923d9c54 HUGO: Add specific function variantes for H2 Dos and H3 Dos
Also add pathfinding to H1 Dos

svn-id: r53822
2010-10-25 12:07:07 +00:00
Arnaud Boutonné
0053b7011e HUGO: Add missing files (sorry!)
svn-id: r53812
2010-10-25 09:22:46 +00:00
Arnaud Boutonné
6889fe42a3 HUGO: Fix GCC warnings
svn-id: r53811
2010-10-25 09:19:06 +00:00
Arnaud Boutonné
eb6dd6d8c8 HUGO: Add specific v1d object class
svn-id: r53810
2010-10-25 09:13:57 +00:00
Max Horn
3534cff8ef ALL: Fix indention (whitespaces -> tabs)
svn-id: r53738
2010-10-23 15:46:50 +00:00
Arnaud Boutonné
4a0ba817e5 HUGO: Move findObjectSpace() to ObjectHandler class
svn-id: r53705
2010-10-22 20:45:00 +00:00
Arnaud Boutonné
0101a0e0bb HUGO: Moved _objects to a separate file
also suppressed some dereferencing

svn-id: r53674
2010-10-21 17:09:57 +00:00
Max Horn
4ccce19876 ENGINES: Enhance namespace comments a bit
svn-id: r53484
2010-10-15 12:48:19 +00:00
Max Horn
34cc54eaa9 Add doxygen comment for namespaces of several engines.
This is an empty template which ideally engine maintainers
would update and complete with concrete information...

svn-id: r53481
2010-10-15 12:28:56 +00:00
Arnaud Boutonné
bd18e20f7d HUGO: Merge engine and hugo files
- Move initNewScreenDisplay to display.cpp
- Merge engine.cpp and hugo.cpp

svn-id: r53468
2010-10-15 06:16:27 +00:00
Arnaud Boutonné
6049a370b3 HUGO: Fix NULL pointer dereferencing
svn-id: r53466
2010-10-15 06:08:42 +00:00
Arnaud Boutonné
7723d91c95 HUGO: Add lineHandler for v3 Dos, fix/add comments
svn-id: r53170
2010-10-12 21:12:54 +00:00
Arnaud Boutonné
7e5f66a4c8 HUGO: enable left diagonals
svn-id: r53167
2010-10-12 20:00:23 +00:00
Arnaud Boutonné
2978053a00 HUGO: Split classes with multiple version in separate files
svn-id: r53152
2010-10-11 21:41:31 +00:00
Matthew Hoops
ed93a58955 HUGO: Use _targetName for naming save files
svn-id: r53145
2010-10-10 23:24:57 +00:00
Arnaud Boutonné
6ebd324be4 HUGO: Add specific takeObject and dropObject for H1 DOS
svn-id: r53135
2010-10-10 22:13:38 +00:00
Arnaud Boutonné
9c56271839 HUGO: Add debug channels to new parser functions
svn-id: r53128
2010-10-10 20:13:59 +00:00
Arnaud Boutonné
440bcaa060 HUGO: Fix 'Exit' command behavior in the DOS versions
svn-id: r53116
2010-10-10 13:06:48 +00:00
Arnaud Boutonné
550d340959 HUGO: Now force initial save
This should fix the corrupted initial savegame problem

svn-id: r53111
2010-10-10 10:00:55 +00:00
Arnaud Boutonné
c50a149a35 HUGO: Remove sound off when saving
svn-id: r53110
2010-10-10 09:59:40 +00:00
Arnaud Boutonné
a4c16f7447 HUGO: Move Dos strings from Parser to hugo.dat
svn-id: r53109
2010-10-10 09:47:19 +00:00
Arnaud Boutonné
ced1aba1ea HUGO: New parser for H1 Dos and H2 Dos.
Add specific parser functions for H1 Dos and H2 Dos

svn-id: r53106
2010-10-10 07:43:42 +00:00
Arnaud Boutonné
694758fd2a HUGO: Clean-up
svn-id: r52988
2010-10-03 08:08:42 +00:00
Arnaud Boutonné
5727cab0f1 HUGO: Remove viewport variables from _config
svn-id: r52963
2010-10-01 09:13:47 +00:00
Arnaud Boutonné
2efaedb29b HUGO: Fix crash using mouse
Fix crash when clicking on objects without a 
default 'TAKE' action (like the hero, the eyes and 
the bat in the first screen)

svn-id: r52962
2010-10-01 06:16:24 +00:00
Arnaud Boutonné
cc69fa8297 HUGO: Improve message boxes
- Use OK and YES/NO messages boxes when required
- Empty messages are no longer displayed

svn-id: r52960
2010-09-30 22:22:05 +00:00
Arnaud Boutonné
07427bed74 HUGO: Suppress useless parameter in several functions
svn-id: r52933
2010-09-28 19:49:53 +00:00
Arnaud Boutonné
d46f4a2fc0 HUGO: Move strlwr to Utils
svn-id: r52921
2010-09-27 21:50:11 +00:00
Arnaud Boutonné
3db60d9e44 HUGO: Add F3 behavior (recall), little cleanup
- Add F3 behavior
- Move drawStatusText() to Screen

svn-id: r52920
2010-09-27 20:24:36 +00:00
Torbjörn Andersson
5537ac91bf JANITORIAL: Removed unnecessary semi-colons.
svn-id: r52910
2010-09-26 15:46:25 +00:00
Arnaud Boutonné
64017f266e HUGO: Remove extra ;
svn-id: r52903
2010-09-26 11:43:07 +00:00
Arnaud Boutonné
20a6180459 HUGO: Add H1 Dos intro
svn-id: r52902
2010-09-26 11:32:52 +00:00
Arnaud Boutonné
009e481547 HUGO: Add H2 Dos splash screen
svn-id: r52880
2010-09-25 13:39:19 +00:00
Arnaud Boutonné
387753705a HUGO: Fix stricmp use and text color in splash screen
svn-id: r52878
2010-09-25 12:59:35 +00:00
Arnaud Boutonné
be4d619864 HUGO: Add intro for H3 Dos
svn-id: r52877
2010-09-25 12:45:12 +00:00
Arnaud Boutonné
b9b1905378 HUGO: Constify char* parameters in Screen
svn-id: r52860
2010-09-22 21:22:11 +00:00
Arnaud Boutonné
0db9a4d6b4 HUGO: Fix intro in H3 Win
This fixes the path on the world map, during intro

svn-id: r52858
2010-09-22 20:37:03 +00:00
Arnaud Boutonné
1e9e8cd64a HUGO: Fix crash in the first screen of H1 Dos
- Fix crash in the first screen of H1 Dos
- Clean up

svn-id: r52787
2010-09-17 22:40:53 +00:00
Arnaud Boutonné
c7b38c4510 HUGO: Fix H1 DOS initialization
Fix a bug in hugo.dat loading and initialize properly Hugo1 DOS

svn-id: r52755
2010-09-16 23:03:03 +00:00
Arnaud Boutonné
2315907de5 HUGO: Rename some classes for better readibility
svn-id: r52720
2010-09-14 05:32:20 +00:00
Arnaud Boutonné
4ac61cc290 HUGO: Fix GCC warning (Thanks MSVC for not showing those)
svn-id: r52698
2010-09-12 23:10:31 +00:00
Arnaud Boutonné
597eed0266 HUGO: Use fonts in HUGO.DAT for the DOS version
This is only a temporary solution, to be replaced by a proper .FON 
handling. Hugo 2 and 3 (dos) now start.

svn-id: r52697
2010-09-12 22:59:32 +00:00
Arnaud Boutonné
be53141091 HUGO: Clean up creation tool
Fix typos and suppress all identical noun arrays. 

svn-id: r52596
2010-09-06 16:09:56 +00:00
Arnaud Boutonné
2bea43357f HUGO: Add hints in DOS versions
In DOS versions, display hints when mouse is over a
hotspot. This behavior is based on the one of Hugo Win
versions.

svn-id: r52590
2010-09-06 12:09:11 +00:00
Arnaud Boutonné
8bd741d41b HUGO: Add support for multiple scenery files
This is used by H3Dos only.

svn-id: r52571
2010-09-05 20:37:38 +00:00
Johannes Schickel
8733cdb900 HUGO: Formatting.
svn-id: r52529
2010-09-04 17:30:39 +00:00
Torbjörn Andersson
871064b3c7 HUGO: Add destructor to Scheduler class
GCC complained, and I think this is what it wanted.

svn-id: r52528
2010-09-04 17:22:27 +00:00
Arnaud Boutonné
a29ae44296 HUGO: Fix decryption in H2 DOS, plus some cleanup
svn-id: r52525
2010-09-04 16:02:16 +00:00
Arnaud Boutonné
21a09427de HUGO: Cleanup and fix mouse pointer issue
- Suppress commented code
- Suppress readConfig() and writeConfig()
- Fix the disappearing mouse issue

svn-id: r52495
2010-09-02 12:50:10 +00:00
Arnaud Boutonné
e284852b64 HUGO: Fix warnings
svn-id: r52494
2010-09-02 11:43:00 +00:00
Arnaud Boutonné
d74e82fe7f HUGO: Fix loading of config file during game init
Add a check on CONFIG.DAT size in order to avoid loading crap into 
the _config structure during the initialization of the engine.
The game no longer starts in turbo & mute mode

svn-id: r52493
2010-09-02 10:52:29 +00:00
Arnaud Boutonné
ca74eb3e8b HUGO: Fix labyrinth bug in Hugo 2 for Windows
svn-id: r52485
2010-09-01 22:11:01 +00:00
Arnaud Boutonné
c4db714e35 HUGO: Fix a bug in creation tool in act14 (H1 Dos)
Fix a bug (missing character id in initialization) in creation tool
and silent some more warnings.

svn-id: r52414
2010-08-27 21:13:47 +00:00
Arnaud Boutonné
03fe16087e HUGO: Fix previous commit (bad format used)
svn-id: r52407
2010-08-27 10:01:09 +00:00
Arnaud Boutonné
ec9708694e HUGO: Hopefully fix GCC_PRINTF issue in util
* Add a mask in each call of Warn(), Error() and Box() not using one
* cleanup: use the same wording for 'End of namespace Hugo' in all files

svn-id: r52406
2010-08-27 09:48:53 +00:00
Oystein Eftevaag
a7541810b4 HUGO: Removed some dead code and redundant indirection
svn-id: r52404
2010-08-26 23:41:39 +00:00
Oystein Eftevaag
98400327c3 HUGO: Implemented basic MIDI support.
svn-id: r52403
2010-08-26 23:13:17 +00:00
Andre Heider
1b2ae60e27 HUGO: Use GCC_PRINTF on functions with variable arguments
Two instances commented out with a FIXME for Strangerke :P

svn-id: r52391
2010-08-25 17:07:47 +00:00
Andre Heider
088da9e698 HUGO: Fix invalid usage of snprintf with va_args
svn-id: r52390
2010-08-25 17:03:24 +00:00
Johannes Schickel
1a0d7c87d3 Hugo: Some formatting fixes.
svn-id: r52265
2010-08-21 17:27:48 +00:00
Arnaud Boutonné
9d5dada110 Oups - Fix compilation
svn-id: r52231
2010-08-20 16:40:13 +00:00
Arnaud Boutonné
e81eab6133 Hugo : Style - Add parenthesis around condition when conditional operator is used, as mentioned in Code Formatting Conventions
svn-id: r52230
2010-08-20 16:35:20 +00:00
Arnaud Boutonné
53bf93a884 Hugo : Add toggle sound, plus little clean up
svn-id: r52229
2010-08-20 16:25:48 +00:00
Arnaud Boutonné
48c9b4855b Hugo - Fix a problem in the F1 behavior
svn-id: r52228
2010-08-20 16:02:00 +00:00
Arnaud Boutonné
30f1312386 Hugo - Add handling of "turbo" key (F8)
- Modify the score line so it looks like the DOS one

svn-id: r52227
2010-08-20 15:55:56 +00:00
Arnaud Boutonné
0b4fef3aa7 Hugo - Move DOS hardcoded inventory strings to Hugo.dat
svn-id: r52226
2010-08-20 15:30:30 +00:00
Torbjörn Andersson
7f97d56829 HUGO: Fix GCC warnings.
svn-id: r52192
2010-08-18 17:51:44 +00:00
Arnaud Boutonné
844b466573 Hugo - Add F6 Inventory. This is a DOS only feature, but quite convenient as the iconic inventory is not available atm.
svn-id: r52190
2010-08-18 16:44:12 +00:00
Arnaud Boutonné
fa41f9ffd0 Hugo - Check double F1, display properly the content of help.dat if present
svn-id: r52189
2010-08-18 16:14:38 +00:00
Arnaud Boutonné
fc94562c77 H3 win - Suppress an enum and use directly the screen number, with a comment
svn-id: r52188
2010-08-18 15:39:40 +00:00
Arnaud Boutonné
ab5bb86e20 No longer error when BSF file is not found in H1 Dos, as it may be a freeware version.
svn-id: r52187
2010-08-18 15:33:59 +00:00
Eugene Sandulenko
3b81b30171 HUGO: Fix intro crash in H3
svn-id: r52186
2010-08-18 14:12:09 +00:00
Eugene Sandulenko
330d467b51 HUGO: Move engine object creation to more suitable place.
svn-id: r52185
2010-08-18 13:44:22 +00:00
Sven Hesse
54c1a1463f HUGO: Fix file permissions
755->644

svn-id: r52177
2010-08-17 23:55:31 +00:00
Arnaud Boutonné
9698f34d92 Hugo - Fix the sprite modification of the hero (quickest test : H1, entering the machine)
svn-id: r52158
2010-08-17 14:21:04 +00:00
Eugene Sandulenko
1ac434165d HUGO: Fix even more warnings
svn-id: r52154
2010-08-17 11:42:47 +00:00
Eugene Sandulenko
2c545ae1f3 HUGO: Fix warnings
svn-id: r52146
2010-08-17 11:00:29 +00:00
Eugene Sandulenko
789219022a HUGO: Fix game restoring
svn-id: r52145
2010-08-17 11:00:00 +00:00
John Willis
c6a1a746df Hugo: Fix very minor typo.
svn-id: r52140
2010-08-17 09:52:34 +00:00
Eugene Sandulenko
7d7acd7042 HUGO: Fix warnings
svn-id: r52139
2010-08-17 09:47:46 +00:00
Eugene Sandulenko
06960d33e1 HUGO: Adding engine to the main tree
svn-id: r52137
2010-08-17 09:28:20 +00:00