From 5affade93ce8c72793c80cfc1a57d34a6bb62523 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 28 Aug 2004 23:25:13 +0000 Subject: [PATCH] cleanup --- stepmania/src/GameState.cpp | 2 -- stepmania/src/NetworkSyncManager.cpp | 4 +++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp index 15bc0c1c2e..ff7dd8a633 100644 --- a/stepmania/src/GameState.cpp +++ b/stepmania/src/GameState.cpp @@ -27,7 +27,6 @@ #include "GameConstantsAndTypes.h" #include "StepMania.h" #include "CommonMetrics.h" -#include "NetworkSyncManager.h" //Used for LUA query #include #include @@ -1852,7 +1851,6 @@ LuaFunction_NoArgs( NumStagesLeft, GAMESTATE->GetNumStagesLeft() ) LuaFunction_NoArgs( IsFinalStage, GAMESTATE->IsFinalStage() ) LuaFunction_NoArgs( IsExtraStage, GAMESTATE->IsExtraStage() ) LuaFunction_NoArgs( IsExtraStage2, GAMESTATE->IsExtraStage2() ) -LuaFunction_NoArgs( IsNetConnected, NSMAN->useSMserver ) LuaFunction_NoArgs( CourseSongIndex, GAMESTATE->GetCourseSongIndex() ) LuaFunction_NoArgs( PlayModeName, PlayModeToString(GAMESTATE->m_PlayMode) ) LuaFunction_NoArgs( CurStyleName, CString( GAMESTATE->m_pCurStyle == NULL ? "none": GAMESTATE->GetCurrentStyle()->m_szName ) ) diff --git a/stepmania/src/NetworkSyncManager.cpp b/stepmania/src/NetworkSyncManager.cpp index 7f9ba77559..ba418e3eb8 100644 --- a/stepmania/src/NetworkSyncManager.cpp +++ b/stepmania/src/NetworkSyncManager.cpp @@ -1,6 +1,7 @@ #include "global.h" #include "NetworkSyncManager.h" #include "NetworkSyncServer.h" +#include "LuaFunctions.h" NetworkSyncManager *NSMAN; @@ -579,7 +580,7 @@ void NetworkSyncManager::SelectUserSong() { m_packet.ClearPacket(); m_packet.Write1( 8 ); - m_packet.Write1( m_iSelectMode ); + m_packet.Write1( (uint8_t) m_iSelectMode ); m_packet.WriteNT( m_sMainTitle ); m_packet.WriteNT( m_sArtist ); m_packet.WriteNT( m_sSubTitle ); @@ -673,6 +674,7 @@ void PacketFunctions::ClearPacket() } #endif +LuaFunction_NoArgs( IsNetConnected, NSMAN->useSMserver ) /* * (c) 2003-2004 Charles Lohr, Joshua Allen