Commit Graph

240 Commits

Author SHA1 Message Date
hikerstk
da3de6d131 Big code refactoring: instead of having auto_kart, player_kart, the karts
now use a 'controller' object which is responsible for its steering, e.g.
a default_ai_controller, player_controller etc. This makes it easier to
switch a player kart to use a end-of-race computer controller to drive
the kart once the race is finished (though that's not implemented yet).
I expect some bugs with restarting race, and perhaps end of race
behaviour at this stage.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4714 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-15 00:54:28 +00:00
hikerstk
328373289a 1) Moved access to world object from race_manager to static functions in
world.
2) Removed more dujplicated/unnecessary functions from race_manager
   (getPlayerKart, getTrack).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4682 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-11 07:11:52 +00:00
hikerstk
b9ffb6fa13 Removed g++ compiler warnings.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4681 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-10 23:55:19 +00:00
hikerstk
c6bf95a64c Started to remove the various kart lists in various objects.
1) Removed getKart from RaceManager.
2) Renamged RaceManager::getNumKarts() to getNumberOfKarts.
   This function should only be called when the world
   does not exist (or is not yet initialised). 	In all
   other cases world::getNumKarts() should be called.
3) Improved several 'const' functions.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4676 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-10 11:40:33 +00:00
hikerstk
4e36fc1f78 Moved WorldStatus enums into WorldStatus class.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4673 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-09 09:24:45 +00:00
auria
998cc50ed0 RIP domestic manners
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4535 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-01-24 23:57:50 +00:00
hikerstk
71616e256e Removed calls to gettext in each frame, instead the tranlsation is only done once when
the object is created.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4432 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-01-11 22:08:33 +00:00
hikerstk
cf0e69b48f Removed #include of kart and player_kart from world.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4424 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-01-10 23:12:29 +00:00
hikerstk
e6296c1987 Fixed speedometer display for irrlicht 1.7 (no change for irr 1.6).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4402 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-01-05 11:31:10 +00:00
auria
33e95fca6a Fixed reported bug with musical note placement in in-game music credits
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4392 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-01-04 18:05:56 +00:00
mbjornstk
5fe41e5625 Run expand -t4 to convert tabs to spaces. No other whitespace fixes, but
there are still trailing spaces and lines with 5 spaces as indent (fix them
as the files are changed for other reasons). src/guiengine/CGUIFont.* and
src/bullet/ not processed to allow cleaner updates from upstream.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4320 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-12-18 00:36:35 +00:00
auria
edf2a43676 As suggested on the mailing list : 3-player-plit-screen should divide in 4 and use the 4th window to put stuff like minimap and players
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4261 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-12-06 18:35:58 +00:00
hikerstk
5b58714fff Revmoed support for irrlicht 1.5 (which doesn't have all functions we need anyway).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4236 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-12-04 01:09:40 +00:00
hikerstk
29ddca4044 Bugfix: the circles representing kart in the minimap had an incorrect colour.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4234 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-12-03 09:10:57 +00:00
hikerstk
ed9bd38402 Some redesign of split screen to enable proper handling of
ambient light changes.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4229 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-11-29 13:04:57 +00:00
hikerstk
a5a90be806 1) Started to add split screen (though not all parts of the race gui are displayed correctly yet).
2) The name of an AI kart will now only get the AI name added if it's profile mode (to prevent
   the name with AI name to be displayed in game)
3) Some code cleanup.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4226 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-11-23 05:20:05 +00:00
hikerstk
4543f6ab5e Ported the display of karts in the minimap to irr 1.6
(note that the speedometer display is also ported, but does
not work atm due to limitations of irr 1.6 ... or incorrect
usage ;)  ).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4120 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-10-15 23:51:41 +00:00
auria
0f14b098cd Completely removed the IRR_SVN macro, makes it confusing for people trying to build STK from autotools. irrlicht version is now detected from irrLicht includes.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4092 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-10-06 19:17:16 +00:00
hikerstk
4d6add9f4c Port for irrlicht 1.6/svn version.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4080 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-10-05 01:23:10 +00:00
hikerstk
0a5e7ba293 Bugfix: the 'circles' representing karts in minimap were not working anymore.
To auria: something's weired with the rtt - you are calling setRenderTarget
twice - but it looks like it's not working for the kart screen otherwise.
I've worked around so that at least the 2d rendering works as expected (with
a single call).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4014 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-09-08 12:50:52 +00:00
auria
c3f0f7ab82 Massive conversion from std::string to stringw for all strings that need to be translated. Currently, translation is broken (strings i try to transalte appear as junk) -- since irrlicht GUI widgets all use wchar_t, using std::string in UTF-8 just didn't make it
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3963 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-30 18:21:59 +00:00
auria
b39414cf8e Many more I18N clarifications, and fine-tuning of extracting strings from XML files
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3960 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-30 01:50:22 +00:00
auria
ff2dd24ec6 Cleaned up render-to-texture code. It should be much more efficient for kart rendering, and also code should be easier to read. @Joerg: I think I didn't break your RTT bits but better check *blush*
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3948 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-29 17:09:03 +00:00
auria
452808838a Fixed various warnings
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3916 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-26 15:18:14 +00:00
hikerstk
6318008c87 Restructured modes to be easier to inerhit from:
- cleanly split into constructor and init()
  phase
- added new isRaceFinished() function
Some minor code cleanup.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3900 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-21 13:05:52 +00:00
hikerstk
ef175e94d4 1) Added alpha version of profile-mode (which replaces if-statements
in world).
2) Moved camera management into race gui, so that the number of split screens
   used can be adjusted (and not only indirect via number of player) - this
   allows e.g. debug modes where you can see 4 AI karts at the same time,
   for profile mode, ...
3) Code cleanup.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3899 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-21 00:32:24 +00:00
hikerstk
184ba6269e Bugfix: the circles for the karts on the minimap were not shown
when the game was started using the menu (instead of -N command
line option).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3878 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-18 09:41:53 +00:00
hikerstk
ce4d1b8000 Fixed VS compiler warnings.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3871 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-17 00:19:55 +00:00
auria
91c04d564f Improved music credit text displayed at the beginning of a race so it's not confused with track author
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3870 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-16 22:52:41 +00:00
auria
a2e93a9b2c Don't show music desc when music is off
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3869 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-16 20:55:06 +00:00
rforder
7a84273ec5 Cleaning up kart selection. Assigns karts correctly in multiplayer. included some null pointer and bounds checks that were causing some
crashes, etc.



git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3856 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-13 22:53:24 +00:00
hikerstk
2b5a273b95 Renamed RaceManager::getKartName to getKartIdent, since this is was the function actually does :)
(prevents us printing the id instead of the name somewhere).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3846 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-13 04:53:51 +00:00
hikerstk
6bed41add5 Bugfix: removed debug/test code.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3812 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-05 12:58:08 +00:00
hikerstk
c64608eec7 Added fixes to STK to work with current irrlicht SVN. All changes
are in #ifdef IRR_SVN - and at this stage linking fails for atm unknown
reasons. No changes to irrlicht 1.5 compilation.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3811 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-08-05 12:45:11 +00:00
hikerstk
a0102fcc0e Fixed half-transparent icons in race gui.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3785 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-07-30 10:20:11 +00:00
hikerstk
89b2eea124 Added first version of track mini map to race gui.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3784 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-07-30 02:40:30 +00:00
hikerstk
368604f379 Added speedometer.
NOTE: to use the speedometer, a patched version of irrlicht is needed. The replacement
files are included here, we hope that the necessary functions will be included in the
next irrlicht release (STK will still compile without a patched irrlicht version,
but not display the speedometer).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3781 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-07-27 11:56:09 +00:00
auria
d1b5f001cb Fixed back warnings (don't remove them this time hiker ;)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3779 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-07-21 01:35:18 +00:00
hikerstk
d8b212aa44 1) Fixed render-to-texture bug (which resulted in black background instead of
transparent one for the kart selection screen and mini map).
2) Added very first version of minimap (scale is wrong, no kart display yet).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3778 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-07-20 12:35:34 +00:00
auria
85266dfe10 Started mammoth cleanup of GUI code. Separated the generic GUI engine and the STK-specific bits (still work to do on this side)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3764 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-07-18 17:48:36 +00:00