wbrawner/reone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify filenames in game/action

Browse source 
E.g., `#include "action/docommand.h"` reads better than `#include "action/commandaction.h"`.
This commit is contained in:
Vsevolod Kremianskii 2021-06-14 11:07:40 +07:00
parent e77e40085b
commit d88156748f
7 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -418,7 +418,7 @@ target_precompile_headers(libscript PRIVATE src/engine/pch.h)
set(GAME_HEADERS set(GAME_HEADERS
src/engine/game/action/action.h src/engine/game/action/action.h
src/engine/game/action/commandaction.h src/engine/game/action/docommand.h
src/engine/game/action/follow.h src/engine/game/action/follow.h
src/engine/game/action/locationaction.h src/engine/game/action/locationaction.h
src/engine/game/action/movetolocation.h src/engine/game/action/movetolocation.h
@ -429,7 +429,7 @@ set(GAME_HEADERS
src/engine/game/action/startconversation.h src/engine/game/action/startconversation.h
src/engine/game/action/usefeat.h src/engine/game/action/usefeat.h
src/engine/game/action/useskill.h src/engine/game/action/useskill.h
src/engine/game/action/waitaction.h src/engine/game/action/wait.h
src/engine/game/animationutil.h src/engine/game/animationutil.h
src/engine/game/camera/animatedcamera.h src/engine/game/camera/animatedcamera.h
src/engine/game/camera/camera.h src/engine/game/camera/camera.h

4
src/engine/game/action/commandaction.h → src/engine/game/action/docommand.h
View file

@ -17,10 +17,10 @@
#pragma once #pragma once
#include "action.h"
#include "../../script/types.h" #include "../../script/types.h"
#include "action.h"
namespace reone { namespace reone {
namespace game { namespace game {

2
src/engine/game/action/startconversation.h
View file

@ -17,8 +17,6 @@
#pragma once #pragma once
#include <string>
#include "objectaction.h" #include "objectaction.h"
namespace reone { namespace reone {

0
src/engine/game/action/waitaction.h → src/engine/game/action/wait.h
View file

2
src/engine/game/actionexecutor.cpp
View file

@ -24,7 +24,7 @@
#include "action/usefeat.h" #include "action/usefeat.h"
#include "action/useskill.h" #include "action/useskill.h"
#include "action/waitaction.h" #include "action/wait.h"
#include "enginetype/location.h" #include "enginetype/location.h"
#include "game.h" #include "game.h"
#include "object/area.h" #include "object/area.h"

2
src/engine/game/actionexecutor.h
View file

@ -21,7 +21,7 @@
#include "glm/vec3.hpp" #include "glm/vec3.hpp"
#include "action/commandaction.h" #include "action/docommand.h"
#include "action/follow.h" #include "action/follow.h"
#include "action/locationaction.h" #include "action/locationaction.h"
#include "action/movetolocation.h" #include "action/movetolocation.h"

4
src/engine/game/script/routines_actions.cpp
View file

@ -23,13 +23,13 @@
#include "../../common/log.h" #include "../../common/log.h"
#include "../action/commandaction.h" #include "../action/docommand.h"
#include "../action/locationaction.h" #include "../action/locationaction.h"
#include "../action/movetolocation.h" #include "../action/movetolocation.h"
#include "../action/movetoobject.h" #include "../action/movetoobject.h"
#include "../action/playanimation.h" #include "../action/playanimation.h"
#include "../action/startconversation.h" #include "../action/startconversation.h"
#include "../action/waitaction.h" #include "../action/wait.h"
#include "../enginetype/location.h" #include "../enginetype/location.h"
#include "../game.h" #include "../game.h"