world improvement

diff --cc Makefile
index c9f143a5d3ab50a91d68979fc882de1fbcc634ce,983bf308994dd16d4e3d7eb600a96cc5c19a61d8..a8f2d8845629f1ca8732d82caa2f8ca39cb9e436
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -2,10 -2,10 +2,10 @@@ LIBS = -lGL -lSDL2_image -lSDL2_mixe
  \r
  FLAGS = -m32 -std=c++11 -Iinclude -Iinclude/freetype2 -lSDL2main -lSDL2 -lfreetype\r
  \r
--all:\r
-       @rm -f out/*.o\r
 -      @rm out/*.o -f\r
++all:
++      @rm -f out/*.o
        @cd src; $(MAKE) $(MFLAGS)\r
 -      @echo "  CXX main.cpp"\r
 +      @echo "  CXX  main.cpp"\r
        @g++ $(FLAGS) -o main main.cpp out/*.o $(LIBS)\r
  \r
  clean:\r

diff --cc include/common.h
Simple merge

diff --cc main.cpp
Simple merge

diff --cc src/common.cpp
Simple merge

diff --cc src/entities.cpp
Simple merge