345
|
|
Merged revisions 292-298,300-368,377-378,381-384,391-395,404,431-433,443-446,448-450,456-466,468-469,474,480,486,490-491,500-506,519-520,526-527,535-598,600-603,620,652,656-680 via svnmerge from https://quadra.googlecode.com/svn/branches/quadra-sdl
........ r292 | pphaneuf | 2006-07-02 16:12:01 -0400 (Sun, 02 Jul 2006) | 3 lines Strip out the biggest parts of the DirectX support (we will use SDL for this in the future). ........ r293 | pphaneuf | 2006-07-02 16:29:15 -0400 (Sun, 02 Jul 2006) | 3 lines The X11 driver is now unconditional, it will be the one going to be mutated into the SDL driver, and then possibly, into replacing the UGS. ........ r294 | pphaneuf | 2006-07-02 16:39:53 -0400 (Sun, 02 Jul 2006) | 2 lines Replace some UGS_DIRECTX references with WIN32. ........ r295 | pphaneuf | 2006-07-02 16:41:28 -0400 (Sun, 02 Jul 2006) | 3 lines Removing the UGS tests, as they have been meaningless for a good while and even less now that UGS is getting replaced with SDL. ........ r296 | pphaneuf | 2006-07-02 17:28:22 -0400 (Sun, 02 Jul 2006) | 2 lines Removed the software cursor. ........ r297 | pphaneuf | 2006-07-03 12:15:17 -0400 (Mon, 03 Jul 2006) | 3 lines Renamed basename to mybasename, to avoid name collisions with the real basename. ........ r298 | pphaneuf | 2006-07-03 14:32:12 -0400 (Mon, 03 Jul 2006) | 2 lines Use AS_HELP_STRING to format the help strings. ........ r300 | pphaneuf | 2006-07-04 16:51:26 -0400 (Tue, 04 Jul 2006) | 2 lines We do not use dlopen anymore, this was for the Svgalib "plugin". ........ r301 | pphaneuf | 2006-07-04 16:52:19 -0400 (Tue, 04 Jul 2006) | 2 lines The "with_x" variable wasn't used anymore. ........ r302 | pphaneuf | 2006-07-04 16:54:32 -0400 (Tue, 04 Jul 2006) | 2 lines Have the configure.ac put the X11 libraries in the X_LIBS variable. ........ r303 | pphaneuf | 2006-07-04 16:56:40 -0400 (Tue, 04 Jul 2006) | 2 lines Use the C++ options to link. ........ r304 | pphaneuf | 2006-07-04 16:58:54 -0400 (Tue, 04 Jul 2006) | 2 lines Centralize all the hacks in the same spot. :-) ........ r305 | pphaneuf | 2006-07-04 17:01:19 -0400 (Tue, 04 Jul 2006) | 3 lines Add conditional compiler flags in the configure.ac script instead of the makefile. ........ r306 | pphaneuf | 2006-07-04 17:02:50 -0400 (Tue, 04 Jul 2006) | 2 lines Test for SDL in the configure.ac script. ........ r307 | pphaneuf | 2006-07-04 17:03:55 -0400 (Tue, 04 Jul 2006) | 2 lines Add a few files specific to Mac OS X. ........ r308 | pphaneuf | 2006-07-04 17:05:20 -0400 (Tue, 04 Jul 2006) | 2 lines Removed unneeded start_game function. ........ r309 | pphaneuf | 2006-07-04 17:06:18 -0400 (Tue, 04 Jul 2006) | 2 lines A few files that now need to include autoconf.h. ........ r310 | pphaneuf | 2006-07-04 17:09:15 -0400 (Tue, 04 Jul 2006) | 2 lines More files needing to include autoconf.h. ........ r311 | pphaneuf | 2006-07-04 17:13:30 -0400 (Tue, 04 Jul 2006) | 3 lines Put the quadra binary in the source directory, beside the quadra.cpp file, so that make can use its implicit rules better. ........ r312 | pphaneuf | 2006-07-04 17:14:40 -0400 (Tue, 04 Jul 2006) | 2 lines Prepare for SDL on Mac OS X, but don't turn it on right now. ........ r313 | pphaneuf | 2006-07-04 17:15:36 -0400 (Tue, 04 Jul 2006) | 2 lines Lets use the same values for the cursor's location as when we lose the focus. ........ r314 | pphaneuf | 2006-07-04 17:17:05 -0400 (Tue, 04 Jul 2006) | 2 lines Just to be sure, assert on the input subsystem being there. ........ r315 | pphaneuf | 2006-07-04 17:17:49 -0400 (Tue, 04 Jul 2006) | 2 lines A few more header file adjustments. ........ r316 | pphaneuf | 2006-07-04 17:19:43 -0400 (Tue, 04 Jul 2006) | 2 lines Preparing for SDL, but not using it yet. ........ r317 | pphaneuf | 2006-07-04 17:20:25 -0400 (Tue, 04 Jul 2006) | 3 lines Support disabling the X11 support at compile-time, even though it doesn't really work correctly (except dedicated mode, of course). ........ r318 | pphaneuf | 2006-07-05 17:36:55 -0400 (Wed, 05 Jul 2006) | 2 lines Removed spurious prototype. ........ r319 | pphaneuf | 2006-07-07 02:18:15 -0400 (Fri, 07 Jul 2006) | 2 lines Removed Video::clean_up and quit_game, as they were useless. ........ r320 | pphaneuf | 2006-07-07 02:19:50 -0400 (Fri, 07 Jul 2006) | 3 lines Added SDL initialization, with a hack needed temporarily on Mac OS X to keep X11 working. ........ r321 | pphaneuf | 2006-07-07 13:25:08 -0400 (Fri, 07 Jul 2006) | 2 lines Updated the build system to try to detect Cocoa and SDL. ........ r322 | pphaneuf | 2006-07-09 08:42:59 -0400 (Sun, 09 Jul 2006) | 2 lines Removed the silly RCSID tagging. ........ r323 | pphaneuf | 2006-07-09 13:33:32 -0400 (Sun, 09 Jul 2006) | 2 lines Move the "dirty" method up to the Video class itself. ........ r324 | pphaneuf | 2006-07-09 16:05:12 -0400 (Sun, 09 Jul 2006) | 2 lines Stupid formatting... ........ r325 | pphaneuf | 2006-07-09 17:12:50 -0400 (Sun, 09 Jul 2006) | 2 lines Use SDL for a few debug input features. ........ r326 | pphaneuf | 2006-07-09 17:13:22 -0400 (Sun, 09 Jul 2006) | 2 lines Width and height should be unsigned. ........ r327 | pphaneuf | 2006-07-09 17:15:29 -0400 (Sun, 09 Jul 2006) | 2 lines We have display, and some basic mouse events. ........ r328 | pphaneuf | 2006-07-09 17:15:51 -0400 (Sun, 09 Jul 2006) | 2 lines No need for the SDL/X11 hack anymore. ........ r329 | pphaneuf | 2006-07-10 05:27:56 -0400 (Mon, 10 Jul 2006) | 2 lines Use the X_LIBS when looking for other X11 libraries. ........ r330 | pphaneuf | 2006-07-10 05:46:22 -0400 (Mon, 10 Jul 2006) | 2 lines Fixed a small mistake in the detection of the SDL library. ........ r331 | pphaneuf | 2006-07-10 05:46:48 -0400 (Mon, 10 Jul 2006) | 2 lines We need stdlib.h for exit(). ........ r332 | pphaneuf | 2006-07-11 09:46:30 -0400 (Tue, 11 Jul 2006) | 2 lines Missing header. ........ r333 | pphaneuf | 2006-07-11 09:58:10 -0400 (Tue, 11 Jul 2006) | 3 lines The get_bitmap and line methods of Video_bitmap weren't used, so I took them out. ........ r334 | pphaneuf | 2006-07-11 12:13:40 -0400 (Tue, 11 Jul 2006) | 2 lines Removed an unused method of the Clipable class. ........ r335 | pphaneuf | 2006-07-11 13:29:44 -0400 (Tue, 11 Jul 2006) | 2 lines Removed a few unused methods from Array. ........ r336 | pphaneuf | 2006-07-11 16:32:30 -0400 (Tue, 11 Jul 2006) | 2 lines A few minor cleanups of Bitmap. ........ r337 | pphaneuf | 2006-07-12 07:31:30 -0400 (Wed, 12 Jul 2006) | 3 lines Include the main header for a given compilation unit first, to sanity-check it. ........ r338 | pphaneuf | 2006-07-12 10:22:54 -0400 (Wed, 12 Jul 2006) | 3 lines Cleaned up a few header files, attempting to make the compilation times on my small laptop bearable. :-) ........ r339 | pphaneuf | 2006-07-12 16:19:24 -0400 (Wed, 12 Jul 2006) | 2 lines Cleaned up the Bitmap class a bit, more coming up. ........ r340 | pphaneuf | 2006-07-13 02:16:19 -0400 (Thu, 13 Jul 2006) | 2 lines More Bitmap cleanups... ........ r341 | pphaneuf | 2006-07-27 16:43:31 -0400 (Thu, 27 Jul 2006) | 2 lines Removed unneeded header file. ........ r342 | pphaneuf | 2006-07-27 16:47:50 -0400 (Thu, 27 Jul 2006) | 2 lines Removed a reference to input.mouse, hoping to simplify the code somewhat... ........ r343 | pphaneuf | 2006-07-27 17:01:46 -0400 (Thu, 27 Jul 2006) | 2 lines Removed references to input.mouse.{dx,dy,dz}. ........ r344 | pphaneuf | 2006-07-28 18:07:53 -0400 (Fri, 28 Jul 2006) | 2 lines Simplified Inter to removed unneeded members. ........ r345 | pphaneuf | 2006-07-28 18:14:22 -0400 (Fri, 28 Jul 2006) | 3 lines Added some support for keyboard input, quite preliminary. Quadra's input layer can be used to scare young children. ........ r346 | pphaneuf | 2006-07-30 12:34:13 -0400 (Sun, 30 Jul 2006) | 2 lines Removed the software cursor sprite. ........ r347 | pphaneuf | 2006-07-30 13:19:46 -0400 (Sun, 30 Jul 2006) | 2 lines Strip out the various input keys definition, as we're focusing on SDL. ........ r348 | pphaneuf | 2006-07-31 16:19:45 -0400 (Mon, 31 Jul 2006) | 2 lines Removed what apparently was a debugging method for development. ........ r349 | pphaneuf | 2006-07-31 16:21:40 -0400 (Mon, 31 Jul 2006) | 2 lines Removed some Windows-specific code, and refactoring the input system a bit. ........ r350 | pphaneuf | 2006-08-10 04:40:44 -0400 (Thu, 10 Aug 2006) | 2 lines Removed a spurious runtime warning. ........ r351 | pphaneuf | 2006-08-10 04:42:40 -0400 (Thu, 10 Aug 2006) | 4 lines Fixed a bug in the Video_bitmap_SDL::rect method, fixed a bug where the frame counter wasn't incremented in SDL, and "implemented" toggle_fullscreen. ........ r352 | pphaneuf | 2006-08-10 04:43:33 -0400 (Thu, 10 Aug 2006) | 2 lines Removed references to UGS_DIRECTX from sound.h. ........ r353 | pphaneuf | 2006-08-10 04:47:13 -0400 (Thu, 10 Aug 2006) | 6 lines Ported the input subsystem to SDL. I broke the other ones in the process, but I will be removing them altogether shortly. Doesn't seem to work completely on Linux/X11, but I think it might just be a minor bug (we use the UniCode feature of SDL without turning it on explicitly, which worked on Mac OS X). ........ r354 | pphaneuf | 2006-08-10 04:50:39 -0400 (Thu, 10 Aug 2006) | 3 lines Enabled the UniCode feature of SDL so that input works correctly on Linux/X11. ........ r355 | pphaneuf | 2006-08-10 05:15:26 -0400 (Thu, 10 Aug 2006) | 3 lines Removed the input_keys.h file, and fixed the last few remaining users. We now use the SDL keysyms everywhere (or so I hope!). ........ r356 | pphaneuf | 2006-08-10 09:41:50 -0400 (Thu, 10 Aug 2006) | 3 lines Removed X11 support. We now use SDL, except for the "dumb" case. ........ r357 | pphaneuf | 2006-08-11 13:37:10 -0400 (Fri, 11 Aug 2006) | 2 lines Added a configure switch for the framerate indicator. ........ r358 | pphaneuf | 2006-08-11 13:37:35 -0400 (Fri, 11 Aug 2006) | 2 lines Fixed a few warnings. ........ r359 | pphaneuf | 2006-08-11 13:40:47 -0400 (Fri, 11 Aug 2006) | 2 lines Added a note about the proper configure invocation for Mac OS X. ........ r360 | pphaneuf | 2006-08-14 18:07:52 -0400 (Mon, 14 Aug 2006) | 3 lines Implemented the formerly-missing "box" method of Video_bitmap, needed for the "demo central". ........ r361 | pphaneuf | 2006-08-14 18:56:22 -0400 (Mon, 14 Aug 2006) | 2 lines Exit more nicely when the SDL "quit" message is received. ........ r362 | pphaneuf | 2006-08-15 07:32:42 -0400 (Tue, 15 Aug 2006) | 2 lines Ported the sound subsystem to SDL. ........ r363 | pphaneuf | 2006-08-15 17:13:22 -0400 (Tue, 15 Aug 2006) | 3 lines Duh, not quite a brown paper bag, but almost. Thanks to slajoie for spotting this! ........ r364 | pphaneuf | 2006-08-16 09:15:35 -0400 (Wed, 16 Aug 2006) | 3 lines SourceForge's terms of service forbid using their servers for such things as the Quadra master server. ........ r365 | pphaneuf | 2006-08-17 14:46:02 -0400 (Thu, 17 Aug 2006) | 3 lines Reduced the dependencies of the wadder tool (which the resource file depends on itself(. ........ r366 | pphaneuf | 2006-08-17 15:54:33 -0400 (Thu, 17 Aug 2006) | 2 lines Big cleaning up of all things audio related. ........ r367 | pphaneuf | 2006-08-18 02:22:25 -0400 (Fri, 18 Aug 2006) | 8 lines Simplified the sound subsystem even further. There's now easy to demonstrate as correct reference counting for sample data, as well as proper encapsulation, so that one can just play a sample and delete it whenever he wishes, and it'll run to completion, without any pesky memory leaks or crashes. The sound->active bool is gone: if you have a non-NULL "sound" pointer, you've got sound going, that's it. There's also a few minor cleanups I did "while I was there". ........ r368 | pphaneuf | 2006-08-18 12:29:55 -0400 (Fri, 18 Aug 2006) | 4 lines Moved the play() method to the Sample class, making invocations of it shorter and allowing me to remove all the pesky "friend" declarations in the sound subsystem. ........ r377 | pphaneuf | 2006-08-19 15:10:18 -0400 (Sat, 19 Aug 2006) | 2 lines Merged revision 376 from trunk. ........ r378 | pphaneuf | 2006-08-20 10:24:23 -0400 (Sun, 20 Aug 2006) | 2 lines Added the start of an update notification feature. ........ r381 | pphaneuf | 2006-08-21 02:45:14 -0400 (Mon, 21 Aug 2006) | 2 lines Fixed up a few minor things. ........ r382 | pphaneuf | 2006-08-22 04:08:51 -0400 (Tue, 22 Aug 2006) | 3 lines Took out the CD music player. Not tested, but it was already disabled, should be okay. ........ r383 | pphaneuf | 2006-08-23 15:44:12 -0400 (Wed, 23 Aug 2006) | 3 lines Fixed an uninitialized member in the Sample class, when the sound was not enabled. ........ r384 | pphaneuf | 2006-08-24 18:31:05 -0400 (Thu, 24 Aug 2006) | 4 lines Added an auto-update feature, which looks to a single file on a web server for its default QServ URL and whether a new release came out, notifying the user in the startup screen. ........ r391 | pphaneuf | 2006-08-26 06:21:10 -0400 (Sat, 26 Aug 2006) | 2 lines Removed a few unneeded header files. ........ r392 | pphaneuf | 2006-08-26 06:27:30 -0400 (Sat, 26 Aug 2006) | 2 lines Fixed a usage of strchr() to work better on Windows. ........ r393 | pphaneuf | 2006-08-26 13:11:15 -0400 (Sat, 26 Aug 2006) | 2 lines Removed the cursor.png image, no longer used. ........ r394 | pphaneuf | 2006-08-26 14:20:39 -0400 (Sat, 26 Aug 2006) | 2 lines Uniformized the inclusions of the SDL.h header, as per their FAQ recommends. ........ r395 | pphaneuf | 2006-08-27 09:26:44 -0400 (Sun, 27 Aug 2006) | 3 lines Removed the crude internationalization, leaving only the English strings in place. ........ r404 | pphaneuf | 2006-08-28 04:30:31 -0400 (Mon, 28 Aug 2006) | 3 lines Variable length arrays are an extension to C++ in GCC, and are not supported by Visual C++ 2005. Using alloca() instead. ........ r431 | pphaneuf | 2006-11-04 16:46:52 -0500 (Sat, 04 Nov 2006) | 2 lines Removed some obsolete debugging facilities. ........ r432 | pphaneuf | 2006-11-04 17:22:43 -0500 (Sat, 04 Nov 2006) | 4 lines Cleaned up some of the conditional code, notably for the unused Linux cdrom.h and soundcard.h headers, the SOCKS support (I can't even get the library anymore!), and finished removing the mcheck.h support. ........ r433 | pphaneuf | 2006-11-04 18:16:44 -0500 (Sat, 04 Nov 2006) | 2 lines Switched to using the SDL byte order macros instead of our home-brewed ones. ........ r443 | pphaneuf | 2006-11-11 16:50:32 -0500 (Sat, 11 Nov 2006) | 2 lines Adding a missing SDL header (for some versions of SDL only). ........ r444 | pphaneuf | 2006-11-22 08:16:08 -0500 (Wed, 22 Nov 2006) | 2 lines Added a proposed icon for the 1.3 release, by Appleman1234. ........ r445 | rveilleux | 2007-03-06 19:15:03 -0500 (Tue, 06 Mar 2007) | 15 lines First Win32 version compiled with SDL: - Added VisualC++ solution and projects - Quadra now requires some runtime DLL: zlib1.dll, libpng12.dll, SDL.dll, SDL_image.dll - New source folder skelton/win32 with Win32 specific files Fixed: - Async hostname resolve was broken on Windows due to windowproc handled by SDL - Command-line option -nofullscreen repaired - Adaptative delay to cap framerate around 100 FPS - Fixed toggle fullscreen (with ALT-ENTER) - Enabled keys ALT-P, META-P, and Pause/Break to pause and unpause game - Modified how Quadra quits when closing the window (on Win32) - Renamed PALETTEENTRY because of silly name clash with wingdi - Removed a bit of Windows.h superfluous dependencies ........ r446 | rveilleux | 2007-03-07 20:56:46 -0500 (Wed, 07 Mar 2007) | 1 line Update win32 visualC++ project: Quadra now statically links SDL.lib, zlib.lib and libpng.lib. ........ r448 | rveilleux | 2008-03-17 20:11:37 -0400 (Mon, 17 Mar 2008) | 2 lines Added proper svn:ignore for VC++ by-products Fixed / Updated vcproj files (Quadra and wadder) ........ r449 | rveilleux | 2008-03-17 20:12:29 -0400 (Mon, 17 Mar 2008) | 1 line Fixed a potential race-condition crash on sound thread initialization ........ r450 | rveilleux | 2008-03-17 20:13:41 -0400 (Mon, 17 Mar 2008) | 1 line Fixme fixed: Mouse wheel support enabled in Zone_listbox ........ r456 | rveilleux | 2008-04-01 20:50:23 -0400 (Tue, 01 Apr 2008) | 6 lines - Updated and fixed executable / window / taskbar icon (Windows build only for now) - Fixed 'version' metadata on Windows build - SDL version is now set to 1.3.0 - Updated README regarding how-to build on Windows platform - Removed dead functions such as lock(), unlock(), restore(), etc. on Video and Input - Fixed Windows palette bug when switching to fullscreen mode due to hardware 8-bit video mode. Quadra now is always running in "true color" mode, but internally is still palettised. Conversion is done on-the-fly at each frame. This has a slight performance drawback, but is probably acceptable on today's machine. Needs testing! ........ r457 | rveilleux | 2008-04-02 23:35:08 -0400 (Wed, 02 Apr 2008) | 2 lines - Added simply 'Dirty rect' management in Video_SDL to optimise drawing a bit - Removed 'twice rendering' that was required in double-buffered DirectX version: In SDL we are drawing an offscreen surface and copy it to the screen ........ r458 | rveilleux | 2008-04-03 23:54:27 -0400 (Thu, 03 Apr 2008) | 1 line Fixed a potential crash-on-exit race condition in network / tcp connection shutdown ........ r459 | rveilleux | 2008-04-07 20:36:29 -0400 (Mon, 07 Apr 2008) | 4 lines WAV loading code replaced by SDL_LoadWAV Changed VisualC++ debug target name to: quadra_debug.exe so it can co-exist with release build Changed link to dynamic SDL.dll: this may not be the best solution. To be investigated. * NOTE: This means that Quadra now requires SDL.dll to be present. ........ r460 | rveilleux | 2008-04-07 21:10:00 -0400 (Mon, 07 Apr 2008) | 3 lines Allow ALT-F4 to quit game (Windows standard shortcut) Prevent 'Escape' key from being used in player key config Added 'delete_obj()' to POSIX platforms: it is responsible for calling SDL_Quit ........ r461 | rveilleux | 2008-04-07 22:03:39 -0400 (Mon, 07 Apr 2008) | 4 lines Added: Text field keyboard movement is back: left/right/home/end, +Shift for selection. Control-A selects all. TAB key now leaves a textfield exactly like ENTER. Fix a bug in player name text field (i.e.: maximum pixel width of entered text could go outside acceptable values) ........ r462 | rveilleux | 2008-04-08 22:45:39 -0400 (Tue, 08 Apr 2008) | 1 line Fixed xcode gcc compiler warning ........ r463 | rveilleux | 2008-04-08 23:48:16 -0400 (Tue, 08 Apr 2008) | 1 line (re)fixed compile warning or error due to static function defined in header file ........ r464 | rveilleux | 2008-04-09 21:04:30 -0400 (Wed, 09 Apr 2008) | 3 lines Fixed (again) 'mybasename' by making it 'inline' instead of static. Quadra project no longer links with dxguid.lib (was not used) Updated README file regarding Windows build instruction ........ r465 | rveilleux | 2008-04-11 23:38:17 -0400 (Fri, 11 Apr 2008) | 2 lines Demo browser updated a bit: Windows side. I'll complete the unix part later on. ........ r466 | rveilleux | 2008-04-12 00:13:59 -0400 (Sat, 12 Apr 2008) | 4 lines Code cleanup in input_dumb Deactivate key repeat when playing, otherwise activate key repeat (i.e.: for text input fields, UI keyboard controls, etc.) ........ r468 | rveilleux | 2008-04-13 10:54:07 -0400 (Sun, 13 Apr 2008) | 3 lines - Fixed unicode text input (a bug was seen on Mac laptop where FN+Home would output an ascii value) - Allow CMD+A for 'Select All' on Mac - Turn unicode translation on and off according to current input context (i.e.: when playing, unicode translation is off, else it is on) ........ r469 | rveilleux | 2008-04-13 11:11:49 -0400 (Sun, 13 Apr 2008) | 1 line Fixed a stupid compiler warning.. ........ r474 | rveilleux | 2008-04-20 01:25:30 -0400 (Sun, 20 Apr 2008) | 3 lines - Config 'latest_version' updated - Path to sourceforge.net replaced by googlecode.com - Enabled runtime version check ........ r480 | slajoie | 2008-04-20 14:54:58 -0400 (Sun, 20 Apr 2008) | 1 line Added a SDL_Delay in a likely spot so that dedicated servers do not consume 100% CPU. Issue 60 fixed. ........ r486 | slajoie | 2008-04-20 17:26:59 -0400 (Sun, 20 Apr 2008) | 1 line Deleting useless file. ........ r490 | pphaneuf | 2008-04-20 18:53:21 -0400 (Sun, 20 Apr 2008) | 2 lines Added specific version numbers for dependencies which I think are more or less correct. ........ r491 | pphaneuf | 2008-04-20 18:59:03 -0400 (Sun, 20 Apr 2008) | 2 lines Updated the SDL version to cover the fix for Mac OS X fullscreen mouse cursor. ........ r500 | pphaneuf | 2008-04-21 21:30:46 -0400 (Mon, 21 Apr 2008) | 2 lines Fixed the Last Warning Ever (tm). ........ r501 | pphaneuf | 2008-04-27 01:32:42 -0400 (Sun, 27 Apr 2008) | 11 lines Hit my head, which apparently canceled out the damage that I had 10 years ago that made me believe that the fix for the INSANE "abort in the constructor" Error class that we new'd and dropped right into the floor (we didn't even have the good sense of just using an unnamed object or putting it on the stack, no, we had to hit the heap allocator and everything!) with liberal casting to void. Turned it into one of these things called "functions". Yeah, I know, wacky, innovative, out of the box thinking, I'm quite proud! Also removed an unused gloval variable in error.cpp. ........ r502 | pphaneuf | 2008-04-27 11:24:22 -0400 (Sun, 27 Apr 2008) | 2 lines We don't use PCX images, get rid of the PCX loader. ........ r503 | pphaneuf | 2008-04-27 11:29:37 -0400 (Sun, 27 Apr 2008) | 2 lines We don't use any raw image file, remove the loader. ........ r504 | pphaneuf | 2008-04-27 23:51:37 -0400 (Sun, 27 Apr 2008) | 2 lines Removed an extraneous "extern" qualification. ........ r505 | pphaneuf | 2008-04-27 23:57:09 -0400 (Sun, 27 Apr 2008) | 2 lines Removed unused lock_msgbox (it's the same as msgbox anyway). ........ r506 | pphaneuf | 2008-05-13 23:35:59 -0400 (Tue, 13 May 2008) | 2 lines Removed some leftover French resources. ........ r519 | pphaneuf | 2008-05-16 11:34:55 -0400 (Fri, 16 May 2008) | 2 lines Fixed the version string. I wonder if the Windows resource builder supports proper CPP? We could use stringification and concatenation here instead... ........ r520 | pphaneuf | 2008-05-16 11:37:07 -0400 (Fri, 16 May 2008) | 2 lines Make the auto-updater know whether it should be looking for the stable or the unstable version. ........ r526 | pphaneuf | 2008-05-23 00:14:48 -0400 (Fri, 23 May 2008) | 2 lines Moved the initialization of SDL to a more sensible place. It's still missing a few flags, though... ........ r527 | pphaneuf | 2008-05-23 00:15:37 -0400 (Fri, 23 May 2008) | 2 lines Improved the reporting of platform information to qserv (when we can). ........ r535 | pphaneuf | 2008-06-12 10:38:51 -0400 (Thu, 12 Jun 2008) | 2 lines We're supposed to initialize subsystems before using them. This worked anyway, but it's easy to do and might be needed on some wacky platform. ........ r536 | pphaneuf | 2008-06-12 11:13:46 -0400 (Thu, 12 Jun 2008) | 2 lines Replace our "dumb video" with the SDL "dummy" video driver. ........ r537 | pphaneuf | 2008-06-12 11:46:55 -0400 (Thu, 12 Jun 2008) | 2 lines Use initializer lists instead of explicitly setting the members. Keeps niggling me... ........ r538 | pphaneuf | 2008-06-12 11:49:27 -0400 (Thu, 12 Jun 2008) | 2 lines Removed the Video_bitmap abstraction and made it just the SDL one. ........ r539 | pphaneuf | 2008-06-12 12:02:35 -0400 (Thu, 12 Jun 2008) | 2 lines Removed the Video abstraction and made it the concrete SDL class. ........ r540 | pphaneuf | 2008-06-12 21:46:07 -0400 (Thu, 12 Jun 2008) | 2 lines Stripped out more of the abstraction hiding the implementation of Video_bitmap. ........ r541 | pphaneuf | 2008-06-14 12:30:11 -0400 (Sat, 14 Jun 2008) | 2 lines Cleaned up the Bitmap and Sprite classes, constified a few more things. ........ r542 | pphaneuf | 2008-06-15 00:38:52 -0400 (Sun, 15 Jun 2008) | 2 lines Some small and varied simplifications. ........ r543 | pphaneuf | 2008-06-15 02:08:58 -0400 (Sun, 15 Jun 2008) | 2 lines Simplified some more, removing the Bitmap in Video_bitmap, as well as a chunk of the setmem() stuff. ........ r544 | pphaneuf | 2008-06-15 15:24:58 -0400 (Sun, 15 Jun 2008) | 2 lines Removed an extraneous call to dirty_clip(). ........ r545 | pphaneuf | 2008-06-15 15:26:35 -0400 (Sun, 15 Jun 2008) | 2 lines Removed the unused "hot spot" feature of Sprite. ........ r546 | pphaneuf | 2008-06-15 16:59:09 -0400 (Sun, 15 Jun 2008) | 2 lines Fixed a few warnings and errors on Ubuntu. ........ r547 | pphaneuf | 2008-06-15 17:59:10 -0400 (Sun, 15 Jun 2008) | 2 lines Reverted r545, as there seem to be some subtle issue that results in a not so subtle crash (and incorrect colouring of fonts). ........ r548 | pphaneuf | 2008-06-15 18:01:46 -0400 (Sun, 15 Jun 2008) | 2 lines Small simplification that was part of r545 but didn't cause the problem. ........ r549 | pphaneuf | 2008-06-15 18:11:01 -0400 (Sun, 15 Jun 2008) | 2 lines New version of r545 that dodges the issue, that seem to be related to some unknown interaction at the construction point. Adding a factory static method makes it go away, will investigate the details later. ........ r550 | pphaneuf | 2008-06-15 18:34:19 -0400 (Sun, 15 Jun 2008) | 2 lines Removed a useless parameter to one of Bitmap's constructor. ........ r551 | pphaneuf | 2008-06-15 19:35:54 -0400 (Sun, 15 Jun 2008) | 2 lines Remove unneeded casting. ........ r552 | pphaneuf | 2008-06-15 19:48:37 -0400 (Sun, 15 Jun 2008) | 2 lines Add a method to obtain an SDL_Surface from an Image. ........ r553 | pphaneuf | 2008-06-15 19:50:11 -0400 (Sun, 15 Jun 2008) | 2 lines Removed a disabled piece of code (death to cruft!). ........ r554 | pphaneuf | 2008-06-15 21:29:51 -0400 (Sun, 15 Jun 2008) | 2 lines Added a Video_bitmap::put_surface. ........ r555 | pphaneuf | 2008-06-15 21:30:49 -0400 (Sun, 15 Jun 2008) | 2 lines Oops, left some debugging output in there we don't really need. ........ r556 | pphaneuf | 2008-06-15 21:31:39 -0400 (Sun, 15 Jun 2008) | 2 lines Replace a use of Sprite with SDL_Surface in Canvas. ........ r557 | pphaneuf | 2008-06-15 21:45:26 -0400 (Sun, 15 Jun 2008) | 2 lines Converted another use of Sprite to SDL_Surface. ........ r558 | pphaneuf | 2008-06-15 23:13:18 -0400 (Sun, 15 Jun 2008) | 2 lines Removed an unused method of Font. ........ r559 | pphaneuf | 2008-06-15 23:36:31 -0400 (Sun, 15 Jun 2008) | 2 lines Added a method to Video that sets the palette of a surface to the same as currently used on the screen. ........ r560 | pphaneuf | 2008-06-15 23:37:08 -0400 (Sun, 15 Jun 2008) | 2 lines Use SDL_Surface instead of Sprite for font drawing. ........ r561 | pphaneuf | 2008-06-15 23:39:26 -0400 (Sun, 15 Jun 2008) | 2 lines Removed the now unused Sprite class. ........ r562 | pphaneuf | 2008-06-16 00:15:43 -0400 (Mon, 16 Jun 2008) | 2 lines A feeble start at trying to cut Canvas down a bit. ........ r563 | pphaneuf | 2008-06-16 01:10:54 -0400 (Mon, 16 Jun 2008) | 2 lines Removed and simplified all sorts of things related to Bitmap. ........ r564 | pphaneuf | 2008-06-16 23:57:04 -0400 (Mon, 16 Jun 2008) | 2 lines Removed a rather silly file (utils.h). ........ r565 | pphaneuf | 2008-06-17 00:05:57 -0400 (Tue, 17 Jun 2008) | 2 lines Sliced off a little bit of the palette stuff. ........ r566 | pphaneuf | 2008-06-17 10:20:51 -0400 (Tue, 17 Jun 2008) | 2 lines Removed unused parts of the Color class. ........ r567 | pphaneuf | 2008-06-17 10:28:47 -0400 (Tue, 17 Jun 2008) | 2 lines Removed Video::dosetpal, it was a one-liner used internally in only one place. Incidentally, it was also only setting the logical palette, instead of both the logical and physical palettes (an SDL subtlety I'm not entirely grasping at the moment?), which it seems we were supposed to do. ........ r568 | pphaneuf | 2008-06-17 11:15:25 -0400 (Tue, 17 Jun 2008) | 2 lines Bite the bullet and provide an accessor in Video to get the display surface. ........ r569 | pphaneuf | 2008-06-17 11:28:13 -0400 (Tue, 17 Jun 2008) | 2 lines Tiny clean up of the Identifyable declaration (I was hoping to remove parts of it, oh well). ........ r570 | pphaneuf | 2008-06-17 11:43:30 -0400 (Tue, 17 Jun 2008) | 2 lines Removed one use of Array. ........ r571 | pphaneuf | 2008-06-17 11:56:17 -0400 (Tue, 17 Jun 2008) | 2 lines Bitmap is now backed by an SDL_Surface, which can be a bit sketchy (we might be lacking locking/unlocking in some cases). ........ r572 | pphaneuf | 2008-06-17 12:45:22 -0400 (Tue, 17 Jun 2008) | 2 lines Switched back to letting SDL manage the display surface as directly as possible. Also changed the dirty rect to be an SDL_Rect. ........ r573 | rveilleux | 2008-06-17 22:21:48 -0400 (Tue, 17 Jun 2008) | 2 lines Fixed compilation on Win32 VisualC++ (various error regarding 'Error', 'assert', deleted files raw.* and pcx.*) Warning: game is broken and crashes ........ r574 | pphaneuf | 2008-06-17 22:49:19 -0400 (Tue, 17 Jun 2008) | 2 lines Reverted r572, which has some kind of bug it would seem. Will debug and re-apply. ........ r575 | pphaneuf | 2008-06-17 23:50:09 -0400 (Tue, 17 Jun 2008) | 2 lines Fixed a weird memory bug that I don't entirely understand but that valgrind assures me I introduced (I isolated it with bisection, then found the suspicious bit and reverted just that in HEAD), and it assures me is now okay. ........ r576 | pphaneuf | 2008-06-18 00:03:32 -0400 (Wed, 18 Jun 2008) | 2 lines Use the Video::surface() indirection everywhere in Video_bitmap. ........ r577 | pphaneuf | 2008-06-18 00:21:12 -0400 (Wed, 18 Jun 2008) | 2 lines Fixed a small memory leak I introduced recently. ........ r578 | pphaneuf | 2008-06-18 00:22:41 -0400 (Wed, 18 Jun 2008) | 2 lines Removed (again) the extra native surface, but without the dirty rect changes I had before. ........ r579 | pphaneuf | 2008-06-18 00:47:04 -0400 (Wed, 18 Jun 2008) | 2 lines Worked out how to avoid the palette issue: Bitmap (and the late Sprite, I presume?) just expects to use the current physical palette, but SDL_Surface has its own palette, and SDL_BlitSurface tries to map colors appropriately. Starting with an empty palette, this made everything black. Set the logical palette of the SDL_Surface before doing the blit to the same as the physical palette fixes it. Now, how the heck does the existing uses of put_surface work? Stroke of luck? Argh... ........ r580 | pphaneuf | 2008-06-18 00:48:01 -0400 (Wed, 18 Jun 2008) | 2 lines SDL_SetColors strikes me as a simpler way to set the palette, let's use that all around for consistency. ........ r581 | pphaneuf | 2008-06-18 00:50:29 -0400 (Wed, 18 Jun 2008) | 2 lines When changing the palette, since we're using SDL in paletted mode, it takes care of updating the screen for use if we don't have a real paletted mode. ........ r582 | pphaneuf | 2008-06-18 00:57:24 -0400 (Wed, 18 Jun 2008) | 2 lines Removed all occurences of Config::xtreme. ........ r583 | pphaneuf | 2008-06-18 00:59:41 -0400 (Wed, 18 Jun 2008) | 2 lines Removed Bitmap::draw, which is now unused. ........ r584 | pphaneuf | 2008-06-18 23:05:47 -0400 (Wed, 18 Jun 2008) | 2 lines Renamed Image::get_surface to Image::new_surface, to be clearer about the ownership. Maybe I should use smart pointers instead? ........ r585 | pphaneuf | 2008-06-19 01:03:37 -0400 (Thu, 19 Jun 2008) | 2 lines Added a Video_bitmap method to do a partial blit of a surface. ........ r586 | pphaneuf | 2008-06-19 01:14:54 -0400 (Thu, 19 Jun 2008) | 2 lines Converted Zone_state_bit to use SDL_Surface. ........ r587 | pphaneuf | 2008-06-19 01:23:52 -0400 (Thu, 19 Jun 2008) | 2 lines Cleaned up the protections of Zone_text_button and annotated the ownership of the Bitmap* in inter.h. ........ r588 | pphaneuf | 2008-06-19 23:01:06 -0400 (Thu, 19 Jun 2008) | 2 lines I think I've got the partial put_surface right, now. ........ r589 | pphaneuf | 2008-06-19 23:01:49 -0400 (Thu, 19 Jun 2008) | 2 lines We need to set the palette of the background when we use it. ........ r590 | pphaneuf | 2008-06-19 23:02:45 -0400 (Thu, 19 Jun 2008) | 2 lines Use a partial put_surface instead of using a temporary Bitmap. ........ r591 | pphaneuf | 2008-06-19 23:45:06 -0400 (Thu, 19 Jun 2008) | 2 lines Made Zone::draw a pure virtual, I don't know why it wasn't already... ........ r592 | pphaneuf | 2008-06-20 01:03:48 -0400 (Fri, 20 Jun 2008) | 2 lines Helper method to set the palette of a surface. ........ r593 | pphaneuf | 2008-06-20 11:45:41 -0400 (Fri, 20 Jun 2008) | 2 lines I give up (for now), this makes both in-game and replays look good. ........ r594 | pphaneuf | 2008-06-20 11:52:27 -0400 (Fri, 20 Jun 2008) | 2 lines Eliminated a few Bitmaps that were only used to clip the source for a blit. ........ r595 | pphaneuf | 2008-06-20 12:08:45 -0400 (Fri, 20 Jun 2008) | 2 lines Hide away the Palette object in Video, as I'm trying to isolate who's meddling with it. Also simplified the setting of the icon, while I was there. ........ r596 | rveilleux | 2008-06-22 17:45:45 -0400 (Sun, 22 Jun 2008) | 1 line Partial fix for Mac OS fullscreen flickering: mouse cursor still not 100% updating correctly ........ r597 | rveilleux | 2008-06-22 18:09:18 -0400 (Sun, 22 Jun 2008) | 1 line Fixed bitmap clipping (on right and bottom) ........ r598 | pphaneuf | 2008-06-22 18:40:15 -0400 (Sun, 22 Jun 2008) | 2 lines Use a hardware palette, so that in 8-bit mode, the palette works correctly. ........ r600 | rveilleux | 2008-06-22 19:34:16 -0400 (Sun, 22 Jun 2008) | 1 line Replaced numerous SDL_SetColors by a cleaner method (Video::clone_palette) ........ r601 | rveilleux | 2008-06-22 20:13:06 -0400 (Sun, 22 Jun 2008) | 2 lines Replaced numerous SDL_SetColors by a cleaner method (Video::clone_palette) oops. missed a file! ........ r602 | rveilleux | 2008-06-22 20:13:43 -0400 (Sun, 22 Jun 2008) | 1 line temporary 'UGS_XCODE' hack to build under xcode ........ r603 | rveilleux | 2008-06-22 20:50:39 -0400 (Sun, 22 Jun 2008) | 1 line Fixed strcpy source/destination overlap (thanks valgrind) ........ r620 | pphaneuf | 2008-06-29 00:29:04 -0400 (Sun, 29 Jun 2008) | 2 lines Replace a sub-Bitmap with an SDL_Surface* with the SDL_Rect that goes with it. ........ r652 | pphaneuf | 2008-11-15 19:24:47 -0500 (Sat, 15 Nov 2008) | 2 lines Added a note about Mac OS X Leopard, which does include libpng. ........ r656 | pphaneuf | 2008-12-14 15:24:07 -0500 (Sun, 14 Dec 2008) | 2 lines Replaced one use of Array with std::vector. ........ r657 | pphaneuf | 2008-12-14 16:59:51 -0500 (Sun, 14 Dec 2008) | 2 lines Switch to initializer list, and move a comment to the header file, where it is more relevant. ........ r658 | pphaneuf | 2008-12-14 18:59:27 -0500 (Sun, 14 Dec 2008) | 2 lines Fixed an uninitialized variable, thanks to Valgrind. ........ r659 | pphaneuf | 2008-12-14 19:18:26 -0500 (Sun, 14 Dec 2008) | 2 lines Fixed a double delete of the background bitmap. Fixes issue #91. ........ r660 | pphaneuf | 2008-12-14 19:43:41 -0500 (Sun, 14 Dec 2008) | 2 lines Replaced Array with std::vector in canvas.h. ........ r661 | pphaneuf | 2008-12-14 19:56:08 -0500 (Sun, 14 Dec 2008) | 2 lines Replaced Array with std::vector in game.h. ........ r662 | pphaneuf | 2008-12-14 21:16:55 -0500 (Sun, 14 Dec 2008) | 2 lines Replaced Array with std::vector in menu.h, as well as some minor cleanups. ........ r663 | pphaneuf | 2008-12-14 21:32:44 -0500 (Sun, 14 Dec 2008) | 2 lines Replaced Array with std::vector in menu_demo_central.h. ........ r664 | pphaneuf | 2008-12-14 21:38:49 -0500 (Sun, 14 Dec 2008) | 2 lines Fixed a signed/unsigned comparison warning. ........ r665 | pphaneuf | 2008-12-14 21:43:43 -0500 (Sun, 14 Dec 2008) | 2 lines Replaced Array with std::vector with net_server.h. ........ r666 | pphaneuf | 2008-12-14 22:00:58 -0500 (Sun, 14 Dec 2008) | 2 lines Replaced Array with std::vector in pane.h. ........ r667 | pphaneuf | 2008-12-14 23:49:13 -0500 (Sun, 14 Dec 2008) | 2 lines Moved from Array to std::vector in zone_list.h, put the implementation of Zone_list::deleteall() inline, and removed that icky mix-in usage, just put it in as a regular member. ........ r668 | pphaneuf | 2008-12-15 00:01:46 -0500 (Mon, 15 Dec 2008) | 2 lines Replaced Array with std::vector in sound.h. ........ r669 | pphaneuf | 2008-12-15 00:46:00 -0500 (Mon, 15 Dec 2008) | 2 lines Replaced Array with std::vector in inter.h, and various little cleanups. ........ r670 | pphaneuf | 2008-12-15 17:16:28 -0500 (Mon, 15 Dec 2008) | 2 lines Replaced Array with std::vector in overmind.h. Some C++ification in Overmind::step() might be more prone to bugs, it could stand a close review... ........ r671 | pphaneuf | 2008-12-15 17:29:44 -0500 (Mon, 15 Dec 2008) | 2 lines Replaced Array with std::vector in listbox.h. ........ r672 | pphaneuf | 2008-12-15 23:13:35 -0500 (Mon, 15 Dec 2008) | 2 lines The list of Executor* in Overmind isn't stable when calling (some) of their step() methods, switched to an std::list, which is stable in that situation. Also removed some traces of my refactoring strategy... ........ r673 | pphaneuf | 2008-12-15 23:27:05 -0500 (Mon, 15 Dec 2008) | 2 lines Replaced Array with std::vector in net_list.h. This one was fairly intrusive, changed a number of index-based iterations with iterators, but it's not always safe (when the code is crazy like this, anyway). ........ r674 | pphaneuf | 2008-12-15 23:31:26 -0500 (Mon, 15 Dec 2008) | 2 lines Replaced Array with std::vector in resmanager.h. ........ r675 | pphaneuf | 2008-12-15 23:48:34 -0500 (Mon, 15 Dec 2008) | 2 lines Replaced Array with std::vector in recording.h. ........ r676 | pphaneuf | 2008-12-15 23:49:53 -0500 (Mon, 15 Dec 2008) | 2 lines Updated a silly comment. ........ r677 | pphaneuf | 2008-12-16 00:00:24 -0500 (Tue, 16 Dec 2008) | 2 lines Replaced Array with std::vector in dict.h. ........ r678 | pphaneuf | 2008-12-16 09:55:23 -0500 (Tue, 16 Dec 2008) | 2 lines Replaced Array with std::vector in net.h, which was a bit involved. ........ r679 | pphaneuf | 2008-12-16 11:07:15 -0500 (Tue, 16 Dec 2008) | 2 lines Replaced Array with std::vector in packets.h. ........ r680 | pphaneuf | 2008-12-16 11:13:22 -0500 (Tue, 16 Dec 2008) | 2 lines Removed array.h, as well as fixing up a few loose ends. ........
|
pphaneuf |
15 years ago
|
|
|