From f4b39596ae70b795645629d1e48bea2700b6bc82 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 23 Apr 2019 16:16:12 +0800 Subject: [PATCH] rename framedata -> frameevent --- server/gameserver/{framedata.cc => frameevent.cc} | 2 +- server/gameserver/{framedata.h => frameevent.h} | 0 server/gameserver/human.h | 2 +- server/gameserver/room.h | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename server/gameserver/{framedata.cc => frameevent.cc} (99%) rename server/gameserver/{framedata.h => frameevent.h} (100%) diff --git a/server/gameserver/framedata.cc b/server/gameserver/frameevent.cc similarity index 99% rename from server/gameserver/framedata.cc rename to server/gameserver/frameevent.cc index 574a2f9..444ac5a 100644 --- a/server/gameserver/framedata.cc +++ b/server/gameserver/frameevent.cc @@ -1,6 +1,6 @@ #include "precompile.h" -#include "framedata.h" +#include "frameevent.h" void FrameEvent::AddAirDrop(int appear_time, int box_id, Vector2D box_pos) { diff --git a/server/gameserver/framedata.h b/server/gameserver/frameevent.h similarity index 100% rename from server/gameserver/framedata.h rename to server/gameserver/frameevent.h diff --git a/server/gameserver/human.h b/server/gameserver/human.h index f567b52..df3a368 100644 --- a/server/gameserver/human.h +++ b/server/gameserver/human.h @@ -1,7 +1,7 @@ #pragma once #include "entity.h" -#include "framedata.h" +#include "cs_proto.pb.h" namespace MetaData { diff --git a/server/gameserver/room.h b/server/gameserver/room.h index 87d5238..1ce6e02 100644 --- a/server/gameserver/room.h +++ b/server/gameserver/room.h @@ -3,7 +3,7 @@ #include #include -#include "framedata.h" +#include "frameevent.h" namespace MetaData {