ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed a few more herrings from network code

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2396 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria
2008-10-30 00:56:45 +00:00
parent b0bdc7edde
commit 7fd5b0fb61
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Makefile.am
View File

@@ -41,8 +41,8 @@ supertuxkart_SOURCES = main.cpp \
network/connect_message.hpp network/character_info_message.hpp \
network/kart_update_message.hpp network/kart_update_message.cpp \
network/kart_control_message.hpp network/kart_control_message.cpp \
network/flyable_info.hpp network/herring_info.hpp \
network/race_state.hpp network/race_state.cpp \
network/flyable_info.hpp network/item_info.hpp \
network/race_state.hpp network/race_state.cpp \
network/race_result_message.hpp network/race_result_message.cpp \
network/race_result_ack_message \
audio/music.hpp \

8
src/ide/Xcode/STK_XCode.xcodeproj/project.pbxproj
View File

@@ -13,6 +13,7 @@
95090A4C0EB7EA960048841A /* item_manager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 95090A480EB7EA960048841A /* item_manager.cpp */; };
9518C11D0EB7AF7A00952372 /* cake.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9518C11B0EB7AF7A00952372 /* cake.cpp */; };
9518C11E0EB7AF7A00952372 /* cake.hpp in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9518C11C0EB7AF7A00952372 /* cake.hpp */; };
958EEFB60EB93C03005F6F70 /* item_info.hpp in CopyFiles */ = {isa = PBXBuildFile; fileRef = 958EEFB50EB93C03005F6F70 /* item_info.hpp */; };
95B0CF470EB69DDA001A0D06 /* actionmap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 95B0C9E90EB69DCE001A0D06 /* actionmap.cpp */; };
95B0CF480EB69DDA001A0D06 /* actionmap.hpp in CopyFiles */ = {isa = PBXBuildFile; fileRef = 95B0C9EA0EB69DCE001A0D06 /* actionmap.hpp */; };
95B0CF490EB69DDA001A0D06 /* music.hpp in CopyFiles */ = {isa = PBXBuildFile; fileRef = 95B0C9EC0EB69DCE001A0D06 /* music.hpp */; };
@@ -445,7 +446,6 @@
95B0D39D0EB69DDF001A0D06 /* connect_message.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 95B0CE6F0EB69DD9001A0D06 /* connect_message.cpp */; };
95B0D39E0EB69DDF001A0D06 /* connect_message.hpp in CopyFiles */ = {isa = PBXBuildFile; fileRef = 95B0CE700EB69DD9001A0D06 /* connect_message.hpp */; };
95B0D39F0EB69DDF001A0D06 /* flyable_info.hpp in CopyFiles */ = {isa = PBXBuildFile; fileRef = 95B0CE710EB69DD9001A0D06 /* flyable_info.hpp */; };
95B0D3A00EB69DDF001A0D06 /* herring_info.hpp in CopyFiles */ = {isa = PBXBuildFile; fileRef = 95B0CE720EB69DD9001A0D06 /* herring_info.hpp */; };
95B0D3A10EB69DDF001A0D06 /* kart_control_message.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 95B0CE730EB69DD9001A0D06 /* kart_control_message.cpp */; };
95B0D3A20EB69DDF001A0D06 /* kart_control_message.hpp in CopyFiles */ = {isa = PBXBuildFile; fileRef = 95B0CE740EB69DD9001A0D06 /* kart_control_message.hpp */; };
95B0D3A30EB69DDF001A0D06 /* kart_update_message.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 95B0CE750EB69DD9001A0D06 /* kart_update_message.cpp */; };
@@ -784,7 +784,6 @@
95B0D39C0EB69DDF001A0D06 /* character_selected_message.hpp in CopyFiles */,
95B0D39E0EB69DDF001A0D06 /* connect_message.hpp in CopyFiles */,
95B0D39F0EB69DDF001A0D06 /* flyable_info.hpp in CopyFiles */,
95B0D3A00EB69DDF001A0D06 /* herring_info.hpp in CopyFiles */,
95B0D3A20EB69DDF001A0D06 /* kart_control_message.hpp in CopyFiles */,
95B0D3A40EB69DDF001A0D06 /* kart_update_message.hpp in CopyFiles */,
95B0D3A60EB69DDF001A0D06 /* message.hpp in CopyFiles */,
@@ -832,6 +831,7 @@
9518C11E0EB7AF7A00952372 /* cake.hpp in CopyFiles */,
95090A4A0EB7EA960048841A /* item.hpp in CopyFiles */,
95090A4B0EB7EA960048841A /* item_manager.hpp in CopyFiles */,
958EEFB60EB93C03005F6F70 /* item_info.hpp in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 1;
};
@@ -844,6 +844,7 @@
95090A480EB7EA960048841A /* item_manager.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = item_manager.cpp; sourceTree = "<group>"; };
9518C11B0EB7AF7A00952372 /* cake.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = cake.cpp; sourceTree = "<group>"; };
9518C11C0EB7AF7A00952372 /* cake.hpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = cake.hpp; sourceTree = "<group>"; };
958EEFB50EB93C03005F6F70 /* item_info.hpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = item_info.hpp; sourceTree = "<group>"; };
95B0C9E90EB69DCE001A0D06 /* actionmap.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = actionmap.cpp; sourceTree = "<group>"; };
95B0C9EA0EB69DCE001A0D06 /* actionmap.hpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = actionmap.hpp; sourceTree = "<group>"; };
95B0C9EC0EB69DCE001A0D06 /* music.hpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = music.hpp; sourceTree = "<group>"; };
@@ -1276,7 +1277,6 @@
95B0CE6F0EB69DD9001A0D06 /* connect_message.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = connect_message.cpp; sourceTree = "<group>"; };
95B0CE700EB69DD9001A0D06 /* connect_message.hpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = connect_message.hpp; sourceTree = "<group>"; };
95B0CE710EB69DD9001A0D06 /* flyable_info.hpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = flyable_info.hpp; sourceTree = "<group>"; };
95B0CE720EB69DD9001A0D06 /* herring_info.hpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = herring_info.hpp; sourceTree = "<group>"; };
95B0CE730EB69DD9001A0D06 /* kart_control_message.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = kart_control_message.cpp; sourceTree = "<group>"; };
95B0CE740EB69DD9001A0D06 /* kart_control_message.hpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = kart_control_message.hpp; sourceTree = "<group>"; };
95B0CE750EB69DD9001A0D06 /* kart_update_message.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = kart_update_message.cpp; sourceTree = "<group>"; };
@@ -2351,13 +2351,13 @@
95B0CE6B0EB69DD9001A0D06 /* network */ = {
isa = PBXGroup;
children = (
958EEFB50EB93C03005F6F70 /* item_info.hpp */,
95B0CE6C0EB69DD9001A0D06 /* character_confirm_message.hpp */,
95B0CE6D0EB69DD9001A0D06 /* character_info_message.hpp */,
95B0CE6E0EB69DD9001A0D06 /* character_selected_message.hpp */,
95B0CE6F0EB69DD9001A0D06 /* connect_message.cpp */,
95B0CE700EB69DD9001A0D06 /* connect_message.hpp */,
95B0CE710EB69DD9001A0D06 /* flyable_info.hpp */,
95B0CE720EB69DD9001A0D06 /* herring_info.hpp */,
95B0CE730EB69DD9001A0D06 /* kart_control_message.cpp */,
95B0CE740EB69DD9001A0D06 /* kart_control_message.hpp */,
95B0CE750EB69DD9001A0D06 /* kart_update_message.cpp */,

6
src/network/herring_info.hpp → src/network/item_info.hpp
View File

@@ -1,4 +1,4 @@
// $Id: herring_info.hpp 1284 2007-11-08 12:31:54Z hikerstk $
// $Id: item_info.hpp 1284 2007-11-08 12:31:54Z hikerstk $
//
// SuperTuxKart - a fun racing game with go-kart
// Copyright (C) 2008 Joerg Henrichs
@@ -17,8 +17,8 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifndef HEADER_HERRING_INFO_HPP
#define HEADER_HERRING_INFO_HPP
#ifndef HEADER_ITEM_INFO_HPP
#define HEADER_ITEM_INFO_HPP
/** Class used to transfer information about collected items from
* server to client.
*/

2
src/network/race_state.hpp
View File

@@ -23,7 +23,7 @@
#include <vector>
#include "network/message.hpp"
#include "network/herring_info.hpp"
#include "network/item_info.hpp"
#include "network/flyable_info.hpp"
#include "kart_control.hpp"
#include "items/item.hpp"