Subversion Repositories eduke32

Rev

Go to most recent revision | Hide changed files | Directory listing | RSS feed

Filtering Options

Rev Age Author Path Log message Diff Changes
8781 308d 1h ny00123 /source/sw/src/ SW: Revert the automapping changes from r5207. Using engine-side code
brought back in r7873, this should restore the behaviors of DOS v1.2.
 
/source/sw/src/cheats.cpp
/source/sw/src/game.cpp
8779 308d 1h ny00123 /source/sw/src/ Revert the change of call to FAF_DrawRooms into a conditional one,
as done in r8766, since this breaks status bar output in tiled
overhead map with Polymost. Do add comment about this for now.
 
/source/sw/src/draw.cpp
8767 311d 3h ny00123 /source/sw/src/ Remove unused FAF_DebugView variable from sw/src/brooms.cpp. The
corresponding variable in rooms.cpp is used if DEBUG is defined
to nonzero.
 
/source/sw/src/brooms.cpp
8766 311d 3h ny00123 /source/sw/src/ sw/src/draw.cpp: Don't draw rooms if textured overhead map is drawn
later. This also turns out to fix a Polymost-specific bug revealed
in SVN r8711. Further remove a call to PicInView which does nothing.
 
/source/sw/src/draw.cpp
8751 316d 7h ny00123 /source/sw/src/ SW: Make quitting by closing the window, now done via CON_Quit,
a bit more usable in multiplayer, hiding the engine's console.
 
/source/sw/src/console.cpp
8750 316d 7h ny00123 /source/sw/src/ SW: Modify MenuLevel and RunLevel by using CON_Quit,
toggling MultiPlayQuitFlag on instead of QuitFlag in
multiplayer games if a player tries to close the window.
Further update MNU_QuitCustom to use CON_Quit.
- In RunLevel, this fixes quit of game for all players.
- In MenuLevel, this leads to transmit of PACKET_TYPE_MENU_LEVEL_QUIT.
However, the work isn't complete, since the game isn't shut down
on the peers' sides, leading to possibly undesired side-effects.

Currently known issue:
- If the master closes the window, the scores won't be shown for
the master. Reason is that waitforeverybody will terminate the app.
 
/source/sw/src/game.cpp
/source/sw/src/game.h
/source/sw/src/menus.cpp
8749 316d 7h ny00123 /source/sw/src/ sw/src/game.cpp:StatScreen crash bug fix: For a given player p,
use p->TeamColor instead of User[p->PlayerSprite]->spal, since
it's possible the player left before the map was loaded.
 
/source/sw/src/game.cpp
8748 316d 7h ny00123 /source/sw/src/ SW: Add a few calls to handleevents around key press loops. Also check
quitevent in the game, and further call getpackets within StatScreen.
 
/source/sw/src/game.cpp
/source/sw/src/jnstub.cpp
8747 316d 7h ny00123 /source/sw/src/ SW: Make sure StatScreen is called around the same time for
all players after level change. This is done by adding calls
to getpackets within the BonusScreen and StatScreen while loops.

It is related to a change from the DOS versions of 1997. Basically,
dosendpackets immediately sends all packets via the commit driver under
DOS, while in the mmulti port in use here, sending might be postponed.

This was leading to a problem with the game entering waitforeverybody
before showing the stats. In particular, it initially attempted to send
a PACKET_TYPE_PLAYER_READY message, which could get postponed in the
manner described above. In case it received PACKET_TYPE_PLAYER_READY
messages from all other peers before the time arrived for sending
pending packets, though, waitforeverybody would return, eventually
leading to a call to StatScreen/BonusScreen, without sending the
pending message until the user in question continued. Other peers
would have to wait for the given player to confirm level change
before they could see their own stat screens.
 
/source/sw/src/game.cpp
8746 316d 7h ny00123 /source/sw/src/ sw/src/game.cpp:NewLevel: Wait for all peers when master player quits.  
/source/sw/src/game.cpp
8745 316d 7h ny00123 /source/sw/src/ sw/src/network.cpp:MyCommPlayerQuit: When master player decides to quit,
make sure all players quit the game. Don't internally change the list
of players, just prepare to quit.
 
/source/sw/src/network.cpp
8744 316d 7h ny00123 /source/sw/src/ sw/src/game.cpp:getinput: Make sure slave actually quits the game  
/source/sw/src/game.cpp
8743 316d 7h ny00123 /source/sw/src/ SW: Fix a bug in getpackets, making SW's Master-Slave code usable,
including 3+ players sessions.
 
/source/sw/src/game.cpp
/source/sw/src/network.cpp
8708 317d 22h terminx /source/ Tweaks to engine compatibility stuff  
/source/build/include/build.h
/source/build/src/clip.cpp
/source/build/src/common.cpp
/source/build/src/engine.cpp
/source/build/src/engine_priv.h
/source/sw/src/game.cpp
8704 319d 22h ny00123 /source/sw/src/ sw/src/game.cpp: Fix crash following an abort of InitGame while
processing multiplayer params or waiting for players. It's been
decided that Control won't call TerminateGame in this case,
one implication being that voidsw.cfg is not updated.
 
/source/sw/src/game.cpp
8703 319d 22h ny00123 /source/sw/src/ SW: Do limit Master/Slave support to 2-players sessions.
Thanks to LittleTijn for testing and inspecting.
 
/source/sw/src/game.cpp
8701 319d 22h ny00123 /source/sw/src/ sw/src/game.cpp: Update processing of multiplayer-related arguments,
mostly from JFSW commits 7a95dee807c735de6588372e268af7a5c7cdc533
and 6137b48d6d432c34d94d08fea527b89539cc3adb. In particular,
this makes Master/Slave usable for 2-player sessions, with SW's
networking code behaving as if these were actually Peer-2-Peer sessions.

Thanks to JonoF for his work on the support.
 
/source/sw/src/game.cpp
8700 321d 23h ny00123 /source/sw/src/ sw/src/draw.cpp:ResizeView: Make map zooming less dependent
on the frame rate
 
/source/sw/src/draw.cpp
8699 322d 9h ny00123 /source/sw/src/ sw/src/menus.cpp: Remove nonexisting MNU_ClearDialog function prototype  
/source/sw/src/menus.cpp
8698 322d 9h ny00123 /source/sw/src/ sw/src/weapon.cpp: Comment out unused MissileSeek and ComboMissileSeek
params, but leave them for documentation. Note that currently, the
only use of ComboMissileSeek is in the saveable_weapon_code array.
 
/source/sw/src/weapon.cpp

Show All