Skip to content

Commit fb87ef5

Browse files
committed
code refactoring/FIXED BUGS
1 parent f9419b3 commit fb87ef5

24 files changed

Lines changed: 700 additions & 610 deletions

.gitignore

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
# Prerequisites
2+
*.d
3+
4+
# Compiled Object files
5+
*.slo
6+
*.lo
7+
*.o
8+
*.obj
9+
10+
# Precompiled Headers
11+
*.gch
12+
*.pch
13+
14+
# Compiled Dynamic libraries
15+
*.so
16+
*.dylib
17+
*.dll
18+
19+
# Fortran module files
20+
*.mod
21+
*.smod
22+
23+
# Compiled Static libraries
24+
*.lai
25+
*.la
26+
*.a
27+
*.lib
28+
29+
# Executables
30+
*.exe
31+
*.out
32+
*.app
33+
34+
/build/
35+
/game_data/
36+
/.vscode/

CMakeLists.txt

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,7 @@ project(Battleship)
44
set(CMAKE_CXX_STANDARD 23)
55
set(CMAKE_CXX_STANDARD_REQUIRED True)
66

7-
include_directories(lib/Settings)
8-
include_directories(lib/ReadWriteQueue)
9-
include_directories(lib/Ship)
10-
include_directories(lib/Master)
11-
include_directories(lib/Slave)
12-
include_directories(lib/RandomShips)
7+
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/lib")
138

149
set(SOURCES
1510
bin/master_main.cpp
@@ -20,23 +15,33 @@ set(SOURCES
2015
lib/Master/Master.cpp
2116
lib/Slave/Slave.cpp
2217
lib/RandomShips/RandomShips.cpp
18+
lib/Commands/MasterCommandHandler.cpp
19+
lib/Commands/SlaveCommandHandler.cpp
20+
lib/Utils/FileUtils.cpp
21+
lib/Utils/PrintUtils.cpp
2322
)
2423

25-
add_executable(master_main.exe
24+
add_executable(master_main
2625
bin/master_main.cpp
2726
lib/Settings/Settings.cpp
2827
lib/ReadWriteQueue/ReadWriteQueue.cpp
2928
lib/Ship/Ship.cpp
3029
lib/Master/Master.cpp
3130
lib/RandomShips/RandomShips.cpp
31+
lib/Commands/MasterCommandHandler.cpp
32+
lib/Utils/FileUtils.cpp
33+
lib/Utils/PrintUtils.cpp
3234
)
3335

3436

35-
add_executable(slave_main.exe
37+
add_executable(slave_main
3638
bin/slave_main.cpp
3739
lib/Settings/Settings.cpp
3840
lib/ReadWriteQueue/ReadWriteQueue.cpp
3941
lib/Ship/Ship.cpp
4042
lib/Slave/Slave.cpp
4143
lib/RandomShips/RandomShips.cpp
44+
lib/Commands/SlaveCommandHandler.cpp
45+
lib/Utils/FileUtils.cpp
46+
lib/Utils/PrintUtils.cpp
4247
)

0 commit comments

Comments
 (0)