Commit Graph

54 Commits

Author SHA1 Message Date
rubidium
86dc219b4b (svn r6204) -Cleanup: replace non-indentation with spaces; like '}<TAB>else {' -> '} else {', tabs between code and comment, etc. 2006-08-28 18:53:03 +00:00
truelight
7abad2b20e (svn r5946) -Add: merged the TGP branch to mainline. TGP adds:
- New optional landscape generator (TerraGenesis Perlin)
  - Load heightmaps (either BMP or PNG)
  - Progress dialog while generating worlds (no longer a 'hanging' screen)
  - New dialogs for NewGame, Create Scenario and Play Heightmap
    - Easier to configure your landscape
    - More things to configure (tree-placer, ..)
  - Speedup of world generation
  - New console command 'restart': restart the map EXACTLY as it was when you
      first started it (needs a game made after or with this commit)
  - New console command 'getseed': get the seed of your map and share it with
      others (of course only works with generated maps)
  - Many new, world generation related, things
  - Many internal cleanups and rewrites
  Many tnx to those people who helped making this:
     Belugas, DaleStan, glx, KUDr, RichK67, Rubidium, and TrueLight (alfabetic)
  Many tnx to those who helped testing:
     Arnau, Bjarni, and tokai (alfabetic)
  And to all other people who helped testing and sending comments / bugs
  Stats: 673 lines changed, 3534 new lines, 79 new strings
2006-08-19 10:00:30 +00:00
Darkvater
04e6f2fe89 (svn r5874) -Feature [FS#234]: Remember the maximized state and restore on start. This also fixes a bug where a different resolution is chosen for a maximized window, but it retains the maximized flag. Only win32. 2006-08-13 10:22:34 +00:00
Darkvater
fe6e29cd2f (svn r5872) - Feature: Add an icon to the SDL openttd executable. 2006-08-13 08:18:11 +00:00
bjarni
e3398f09e7 (svn r5460) -Feature: [OSX] macs with touchpads that support two finger scrolling can now use this "scrollwheel" to scroll up/down (ln-) 2006-07-04 19:02:49 +00:00
tron
772fbda3e3 (svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular 2006-06-27 21:25:53 +00:00
tron
a2362674e3 (svn r5210) Many small changes which piled up: const, unsigned, variable scope, CSE for readability, DeMorgan, if cascades -> switch, whitespace, parentheses, bracing, misc. 2006-06-10 08:37:41 +00:00
glx
434fb4e08c (svn r4810) - Fix: removed warning about strict-alias (release build) 2006-05-09 17:24:08 +00:00
bjarni
9ad9a138ad (svn r4099) -Codechange: [OSX] the cocoa video driver speedup of around 1000% now also applies to Intel macs 2006-03-25 07:22:53 +00:00
Darkvater
bdfe20ae73 (svn r4091) - Fix r4075. Do not "enter" please. 2006-03-24 17:40:55 +00:00
Darkvater
549f9b0d2f (svn r4090) - Followup for r4075. Some SDL implementations seem to have a different define for the SDL_ACTIVEEVENT SDL_APPMOUSEFOCUS which caused undrawing of the mouse only on losing input-focus. Correctly check for the event state 2006-03-24 17:00:55 +00:00
egladil
5cec20988d (svn r4083) -Feature: [OSX] Ported r4075 (Undraw the mouse when it leaves the window and Draw it again when it enters). 2006-03-24 10:17:39 +00:00
bjarni
cc9b448d7f (svn r4082) -Fix: [OSX] FS#80 Crash when switching from windowed to fullscreen
this bug was introduced in rev 3670, but when undetected for a long time since it was resolution specific
	this is likely the issue with x86 OSX in fullscreen, so I removed the really slow workaround and will clean it up once I get positive feedback from a x86 mac
	this means that x86 OSX should now get the 1000% video driver speed boost as well
	this fix is written by eglandil
2006-03-24 09:47:50 +00:00
Darkvater
fb48c3b4aa (svn r4075) - Feature: Undraw the mouse when it leaves the window and Draw it again when it enters. Added both for WIN32 and SDL. Since Win95 has troubles with TrackMouseEvent(), this function was just simply rewritten which was the easiest. Based on a patch by DmitryKo. 2006-03-24 00:42:35 +00:00
Darkvater
54735b28c4 (svn r3999) - Fix: [win32] Change the order of DestroyWindow and ChangeDisplay. On some machines a sizechange messagequeue is handled before sending WM_DISPLAYCHANGE resulting in an improper resolution written to the configuration file when exiting from fullscreen. (Frostregen) 2006-03-21 21:55:49 +00:00
bjarni
a6b3a519d9 (svn r3971) reverted r3742 as those new errors were not the right way to handle those exceptions 2006-03-18 16:11:29 +00:00
bjarni
4db34f71c3 (svn r3742) -codechange: [OSX] changed an assert to use the new error window and added another two to show if the screen buffer fails for some reason in cocoa driver (instead of just crashing) 2006-03-02 22:21:27 +00:00
bjarni
e8f85b50f0 (svn r3741) -Fix: [i686 OSX] reverted the change in rev 3670 for non PowerPC (done with #ifdef) since it appeared to crash intel based macs
This fix is not a good solution and might not work, but if it works, it's better than nothing until we get the real solution
2006-03-02 22:00:57 +00:00
bjarni
6400e07918 (svn r3671) -Code cleanup: fixed style and removed commented out code in video/cocoa_v.m 2006-02-24 22:12:11 +00:00
bjarni
aa3e439a68 (svn r3670) -Codechange: [OSX] rewrote a part of the cocoa video driver to speed it up by 1000% in fullscreen
rewrote QZ_DrawScreen to only redraw dirty rectangles (instead of everything)
	This reduce the OpenTTD time spent on this function from 75% to 6,7% (in main menu)
	Note: window mode is unaffected by this commit
	Note: the mouse pointer can now leave artefacts in debug mode
2006-02-24 22:05:20 +00:00
Darkvater
a2c9df81b9 (svn r3640) - Remove win32-only variables from variables.h and put them into win32_v.c. Also ifdef the win32 specific configuration file settings. 2006-02-20 23:01:58 +00:00
bjarni
b6cdb521a1 (svn r3618) -Codechange: [OSX] reduce the time spend in the cocoa video driver
by caching global vars in local vars, the CPU keeps them in registers when looping all pixels on screen
	this reduce reading from RAM, which is much slower (Tron wrote this after I detected that those loops used a lot of time)
	Note: since the reduced time is waiting for the RAM, the actual CPU usage is not reduced.
	This means that it's only detectable while fast forwarding and other situations when OTTD wants to use more than 100% of the CPU time
2006-02-19 10:21:01 +00:00
tron
136cffaf5a (svn r3617) Fix warning introduced in r3616 2006-02-18 18:27:17 +00:00
tron
afade61293 (svn r3616) Style sweep 2006-02-18 17:27:06 +00:00
tron
5ac015afc8 (svn r3615) Remove the Quartz key codes from the public cocoa video driver interface 2006-02-18 16:20:50 +00:00
bjarni
8744075a6c (svn r3596) -Codechange: [OSX] changed to use Apple's macros instead of OTTD macros for endian conversion
This increases the execution speed a lot since GCC can't detect the OTTD macro as an endian conversion
	while Apple's code uses the instruction to convert endian instead of a series of instructions to produce the same result

	Since we don't have that many endian conversions in the game, overall performance should not increase noteworthy
2006-02-12 14:31:33 +00:00
tron
1c3e8630fe (svn r3511) More whitespace ([FS#46] by Rubidium) 2006-02-01 07:36:15 +00:00
bjarni
1b9466802f (svn r3393) -Fix: [OSX] some keyboards had a different scancode for opening the console (egladil) 2006-01-09 21:14:56 +00:00
truelight
a1f8309453 (svn r3375) -Add: [ FS#29 ] show an error dialog for OSX cocoa driver (egladil) 2006-01-06 21:27:44 +00:00
tron
04c096ee63 (svn r3339) Remove unnecessary includes 2005-12-24 20:54:31 +00:00
Darkvater
17f8534e5a (svn r3320) - Fix: FS#22 - Exiting with double size enabled saves wrong window size. Reset the window size to its true size upon exiting when double-size is active. Is set in ClientSizeChanged. 2005-12-19 00:19:12 +00:00
peter1138
a7730d4a09 (svn r3288) Set svn properties on cocoa related files, and add Id tag.
Add extern to cocoa sound driver.
2005-12-11 10:25:27 +00:00
bjarni
1adc1738f7 (svn r3286) -Fix: [OSX] 10.2 works again and universal binaries got 10.2 as target by default 2005-12-10 23:03:59 +00:00
bjarni
50a1e16943 (svn r3281) -Feature: [OSX] added native cocoa sound and video drivers (egladil)
you can still use SDL drivers if you like and you have to run "make upgradeconf" to start using the cocoa drivers (or manually write WITH_COCOA:=1)
	since SDL breaks the cocoa drivers, you can't compile with both SDL and cocoa support
	Using cocoa drivers makes it easier to make universal binaries and it solves:
	-FS#18 [OSX] SDL is weird in universal binaries
	-FS#2  [OSX] lazy pointer crash on exit
	-FS#10 [OSX] linking error when linking statically to SDL 1.2.8 (needless to explain this, but it means it should be able to compile statically with the default settings now)
	-[ 1215073 ] Switching to large size out of fullscreen crashes
	Using SDL drivers will still have those issues though
2005-12-10 11:16:45 +00:00
tron
5cceeaa37f (svn r3207) Typo in last revision 2005-11-16 13:45:42 +00:00
tron
7d750783af (svn r3206) Wrap all instances of _dbg_screen_rect in #ifdef _DEBUG 2005-11-16 13:45:04 +00:00
bjarni
488db23ed8 (svn r3023) -Fix [BeOS] fixed compilation on BeOS R5 (MYOB) 2005-10-06 18:28:27 +00:00
tron
c20b5883bd (svn r2924) Introduce the ALIGN() macro which aligns values to multiples of a power of 2, for exact semantics see the commment in macros.h 2005-09-08 12:48:26 +00:00
ludde
9a060a0f24 (svn r2781) Fix some of the issues with variables in .h files. 2005-08-01 16:31:19 +00:00
tron
452f8fee2a (svn r2748) Remove unused cruft from the main loop 2005-07-29 16:40:29 +00:00
tron
a7acb22781 (svn r2746) -Fix: SDL_SetColors() has the number of palette entries to change as parameter, not one beyond the last entry to change 2005-07-29 10:16:49 +00:00
tron
5fd69294ee (svn r2728) -Fix/Feature: Change the driver probing algorithm
Instead of trying to start a single driver and bailing out if that fails, try to initialise one by one and use the first one which succeeds.
This should fix problems on machines with no sound card, where -s null had to be specified manually.
2005-07-27 19:57:12 +00:00
tron
2435589804 (svn r2726) Fix last commit 2005-07-27 19:25:50 +00:00
tron
9aa4893e66 (svn r2725) Move MyShowCursor() back into win32.c, it fits better there 2005-07-27 19:22:38 +00:00
tron
452652e85e (svn r2720) Remove unused declarations and definitions 2005-07-26 19:34:03 +00:00
tron
030b4c2704 (svn r2710) Simplify dedicated server code a bit and don't compile it at all, if network support ist disabled 2005-07-25 16:33:58 +00:00
tron
2faf06f4cd (svn r2704) Remove . from include path again, too much trouble. Also add some #ifdefs and #includes for the Windows build 2005-07-25 07:16:10 +00:00
tron
647cbd6bdd (svn r2701) Insert Id tags into all source files 2005-07-24 14:12:37 +00:00
orudge
369b36f6b1 (svn r2695) - Fix: OS/2 project update, add os2.h to dedicated_v.c 2005-07-23 19:00:56 +00:00
tron
8100d06caa (svn r2694) Various smaller changes: eol-style, static, code simplification 2005-07-23 18:46:17 +00:00