Commit Graph

78 Commits

Author SHA1 Message Date
auria
b868909efe Some cleanups with ActivePlayer. Moved it to StateManager, because that's where active players are created and stored - this will be less confusing than hiding it inside a configuration class. More work is still to be done if we want to make this code really clean, though.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4764 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-18 21:28:32 +00:00
hikerstk
31e3806fd0 Refactor end of race handling so that more functions are done in a base class only
(esp. code that was previously duplicated in the battle mode and standard race).
There is now time for an end animation, even if the player should finish last
(in which case the previous end camera would not be shown). This mostly in 
preparation for end animations.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4750 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-17 11:59:51 +00:00
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
4a96f98182 Removed player- and network-kart lists from world, so now
there is only one list used to access all karts in world.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4680 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-10 22:59:17 +00:00
hikerstk
47a1a1dfa2 Removed m_local_player_karts vector from world.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4678 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-10 12:47:18 +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
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
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
74c6dd557c Added an implicit dependency that caused problems on some systems (fixed previous commit, it was plain wrong)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4091 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-10-06 17:03:08 +00:00
auria
b59b754ab3 Added an implicit dependency that caused problems on some systems
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4090 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-10-06 16:59:45 +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
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
auria
fbc3119dbc Continued cleaning up references to Player & ActivePlayer and docs
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3762 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-07-18 15:32:54 +00:00
auria
2c0a322b61 Started cleaning up references to Player to use ActivePlayer where relevant
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3761 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-07-18 15:21:16 +00:00
auria
36bfc5e7fe The player list can now be extended in Options, and is saved to file and loaded too
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3630 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-06-21 18:55:12 +00:00
auria
2f6b05bace started converting user config to XML. Implementation is not 100% complete yet; saving works, not lodading. Implementation is not the prettiest but designed for minimal maintenance.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3625 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-06-21 01:10:43 +00:00
hikerstk
ee90eca26e 1) Created new config subdir and moved the last remaining files into
appropriate subdirs (only main.cpp and main_loop.?pp are now directly
   in the src directory).
2) Cleaned up all #include directives, so that all files now use
   the right subdirectories.
3) Some minor code cleanup.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3606 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-06-11 10:00:43 +00:00
hikerstk
25b9d9643c Replaced all remaining HEADER_.*_H with HEADER_.*_HPP .
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3585 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-06-03 02:17:43 +00:00
hikerstk
590eab3315 Missed one file in previous commit - another wrong include fixed.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3584 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-06-03 02:14:32 +00:00
hikerstk
64d72dabad Fixed incorrect include paths.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3583 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-06-03 02:12:37 +00:00
hikerstk
96805cfc71 Moved race related files into new subdir 'race'.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3581 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-06-03 01:36:48 +00:00
auria
4acc6fc7c8 first introduction of new GUI code. It does *not* work, consider this a backup (and the removal of the old UI)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3256 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-03-13 13:50:24 +00:00
mbjornstk
fc46307f54 Fixing all remaining "executable" flags.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@3205 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-02-27 02:54:25 +00:00
hikerstk
6f34674b4c 1) Moved more files around.
2) Replaced many (though not all yet) snprintf with ostringstream
   (getting rid of the maximum length of messages).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@3034 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-01-23 05:23:22 +00:00
hikerstk
6ce3803165 Moved more files into subdirs.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@3029 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-01-22 22:27:13 +00:00
hikerstk
340fc18548 1) Applied Jonan's patch to fix the layout for many files.
2) Moved STK specific extensions to bullet out of
   bullet src tree.
3) Started to move more files into separate subdirs.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@3027 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-01-22 12:02:40 +00:00
hikerstk
514619fd69 Removed some compiler warning - thanks to Jonan for the patch.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2891 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-01-13 01:07:12 +00:00
hikerstk
1c81e0f664 1) Removed references to wheelie and jump kart control structure.
2) Config files will now use nitro/drift instead of wheelie/jump.
   Old config files will automatically be updated (and a message
   be printed).
3) Renamed all members of the kart control structure to start
   with m_ .


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2737 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-12-21 21:40:00 +00:00
hikerstk
b27e113048 Bugfix: removed ghost characters that appeared when using challenges.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2635 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-12-12 03:55:27 +00:00
hikerstk
64a609d45f Cleaned up some unnecesary includes in .h files.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2591 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-12-09 22:21:01 +00:00
hikerstk
cce4da5a62 Moved Vec3 and Coord into utils subdir.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2539 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-12-01 22:43:50 +00:00
hikerstk
ab506f462a Moved kart-related files into separate subdirectory.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2416 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-11-07 04:34:01 +00:00
auria
c595c74f7a renamed 'collectible' to 'powerup'
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2400 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-10-30 02:02:56 +00:00
auria
7fd5b0fb61 removed a few more herrings from network code
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2396 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-10-30 00:56:45 +00:00
auria
c834005143 removed most 'herring' names
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2392 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-10-29 15:55:54 +00:00
auria
42e0af65b7 started renaming herring to item
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2389 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-10-29 01:45:29 +00:00
auria
39bdf4f0b0 moved all item-related files into a new /items repository
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2385 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-10-28 01:46:35 +00:00
hikerstk
ef66104671 Bugfix: LAN mode didn't work anymore:
minor race mode can not be send as char anymore, it has to be int.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2375 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-10-24 13:44:09 +00:00
hikerstk
68278f6847 Applied Paul's network menu patch.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2374 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-10-24 12:12:42 +00:00
auria
0c945d61d3 Made World derive from 'Clock' (now 'TimedRace') simplifying a lot of things, especially the race end process
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2323 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-10-04 17:32:40 +00:00
hikerstk
f055a2c6bd 1) LAN mode now supports GP and restarting/setting up
new game etc.
2) Fixed non network end-of-game handling.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2320 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-10-02 00:27:39 +00:00
hikerstk
fb2900f05b Bugfix: GP information wasn't properly sent from server to client.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2319 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-10-01 12:37:20 +00:00
hikerstk
1809dd1da1 Synchronised race results menu, single races in LAN
mode can now be restarted (GP and FTL modes are still 
to be done).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2307 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-09-29 02:29:33 +00:00
auria
0ece64bc05 split major and minor modes, started some more encapsulationa round that
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2292 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-09-22 00:55:27 +00:00
auria
cc61f53ff8 more cleanup, replaced World global variable with singleton-like implementation, removed lots of includes to world.hpp
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2291 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-09-21 16:07:56 +00:00
hikerstk
c0226902a7 Bugfix: debug code was still left in (which removed the first kart).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2278 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-09-19 02:28:27 +00:00
hikerstk
1ee4c7976a Bugfix: Compiler optimisations on certain compilers could cause the
networked version to fail (indication: warning message "warning:
dereferencing type-punned pointer will break strict-aliasing rules").


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2266 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-09-14 15:01:14 +00:00
hikerstk
8a4a939980 1) Character selection is now synchronsied between all clients and server (i.e.
a character can only be selected once, and is then not available for other
   players anymore).
2) Fixed restart race (which would finish the race after about 11 seconds)
3) Moved widget related classes into gui dir.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2264 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-09-13 07:09:36 +00:00
hikerstk
15b9ca64c6 1) Fixed 'install' and 'dist-*' make targets.
2) Removed unused files.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2260 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2008-09-10 00:26:04 +00:00