commit bc9ea011

sago007 · 2009-04-12 17:43
bc9ea011dcc68066e6e774b258a657b184d62adb patch · browse files
parent e7eae715212285e08ec1b9db1caffdd8b6159ad3

Removed dependecy on libcurl


git-svn-id: https://blockattack.svn.sourceforge.net/svnroot/blockattack/trunk@83 9d7177f8-192b-0410-8f35-a16a89829b06

Changed files

M	source/code/AUTHORS before
M	source/code/block.make before
M	source/code/main.cpp before
M	source/manual/block_attack_manual.tex before

diff --git a/source/code/AUTHORS b/source/code/AUTHORS index ea73053..01cbdf0 100644 --- a/source/code/AUTHORS +++ b/source/code/AUTHORS

@@ -8,5 +8,8 @@ Done some work for making it work with SHAREDIR and all Scons scripts

Contains SFont - SDL Font Library by

Karl Bartel <karlb@gmx.net>

+A lot of the 1.4.0 graphics is by

+Iwan Gabovitch aka qubodup

Jordà Polo

Two patches

diff --git a/source/code/block.make b/source/code/block.make index 4a1fe12..61e1ce3 100644 --- a/source/code/block.make +++ b/source/code/block.make

@@ -47,7 +47,7 @@ else

BASE_CFLAGS += -DUSE_ABSTRACT_FS=0

endif

-$(BINARY): build/main.o build/highscore.o build/SFont.o build/ReadKeyboard.o build/joypad.o build/listFiles.o build/replay.o build/common.o build/stats.o build/uploadReplay.o

+$(BINARY): build/main.o build/highscore.o build/SFont.o build/ReadKeyboard.o build/joypad.o build/listFiles.o build/replay.o build/common.o build/stats.o

$(CPP) -O -o $(BINARY) build/main.o build/highscore.o build/SFont.o build/ReadKeyboard.o build/joypad.o build/listFiles.o build/replay.o build/common.o build/stats.o $(BASE_LIBS)

#-lphysfs

@@ -78,8 +78,8 @@ build/stats.o: stats.h stats.cc

build/common.o: common.h common.cc

$(CPP) $(BASE_CFLAGS) common.cc -o build/common.o

-build/uploadReplay.o: uploadReplay.cc uploadReplay.h

- $(CPP) $(BASE_CFLAGS) uploadReplay.cc -o build/uploadReplay.o

+#build/uploadReplay.o: uploadReplay.cc uploadReplay.h

+# $(CPP) $(BASE_CFLAGS) uploadReplay.cc -o build/uploadReplay.o

#build/MenuSystem.o: MenuSystem.cc MenuSystem.h

# $(CPP) $(BASE_CFLAGS) MenuSystem.cc -o build/MenuSystem.o

diff --git a/source/code/main.cpp b/source/code/main.cpp index e3114a1..a8d4c98 100644 --- a/source/code/main.cpp +++ b/source/code/main.cpp

#if LEVELEDITOR

#include "editor/editorMain.hpp" //The level editor

#endif

-#include "uploadReplay.h" //Takes care of everything libcurl related

+//#include "uploadReplay.h" //Takes care of everything libcurl related

#include "common.h"

diff --git a/source/manual/block_attack_manual.tex b/source/manual/block_attack_manual.tex index 820e685..a895698 100644 --- a/source/manual/block_attack_manual.tex +++ b/source/manual/block_attack_manual.tex

@@ -5,7 +5,7 @@

%\usepackage[T1]{fontenc}

\begin{document}

-\title{Block Attack - Rise of the Blocks 1.3.2 - The Manual}

+\title{Block Attack - Rise of the Blocks 1.4.0 - The Manual}

\author{Poul Sander}

\maketitle

\tableofcontents

@@ -19,7 +19,7 @@ are other features in 2-player mode. The game also supports network play

if it is compiled with the game.

\subsection{About Block Attack - Rise of the Blocks}

Block Attack - Rise of the Blocks is programmed in C++ by me (Poul

-Sander) and it is given under the GPL licens. I have tried to keep

+Sander) and it is given under the GPL licens version 2 or later. I have tried to keep

it as portable as possible by using cross-platform libraries. It

uses the following libraries:

\begin{description}

@@ -30,7 +30,7 @@ from: \newline http://www.libsdl.org/projects/SDL\_image/

\item[enet] from: \newline http://enet.bespin.org

\end{description}

For development have been used Dev-C++, Microsoft Visual Studio

-2003 and gedit. The Gimp, Jasc Paint Shop Pro and Photoshop has been used for the graphics. The

+2003, gedit, Kdevelop and NetBeans (changed as time passed). Most of the current graphics are made in Inkscape. The

game has been compiled on both Windows and Linux. \newline The

game's homepage is:

\verb+http://blockattack.sf.net+

@@ -38,10 +38,10 @@ game's homepage is:

The game got lots of options, this section will give an overview.

\subsection{Installation}

Installing Block Attack - Rise of the Blocks is easy, in windows

-you simply run the installer "BlockAttackWin32.exe" file and

+you simply run the installer "BlockAttackWin32-X.X.X.exe" file and

choose a location you want to install to. Under Linux systems you

can get a precompiled package including source. On some systems

-you may have to recompile. There are two options for compiling. You can use \verb+make+ in enet-1.0 and then in the folder with source files. Or you can use \verb+scons+ by typing \verb+scons+ as a normal user and then \verb+scons install+ as root. \newline

+you may have to recompile. There are two options for compiling. You can use \verb+make+ on the svn checkout/source package.\newline Or you could use \verb+scons+ by typing \verb+scons+ as a normal user and then \verb+scons install+ as root however it is currently broken for unknown reason. \newline

%to do this type \verb+make+ while in the source dictory (there the cpp files are). To install the game in Linux type \verb+make install+, you can change the \verb+Makefile+ for dictory placements. \verb+make remove+ removes the game again. Both \verb+make install+ and \verb+make remove+ must be runned as root. \newline

Scons should be used for packing there gamedata and executables should be in different places.

@@ -73,8 +73,8 @@ been removed to reduce size, also the framerate dropped

significantly.

You can also change names and controls. The default controls for

-player 1 is: move: the arrow keys, keypad\_0 to push lines and

-keypad\_enter to switch blocks.

+player 1 is: move: the arrow keys, Right shift to push lines and

+Right to switch blocks.

The default controls for player to is: move: WASD, lift shift to

push and left control to switch.

@@ -173,5 +173,6 @@ Windows and Linux uses can play against each other but some operating systems mi

\section{Replays}

The game supports Replays of matches. After you have played a game you can go to the Replay-menu and select "Save" and then enter a name. You can then at any time select "Load" and see it again. The first version of the replay system does only support up to 5 minuttes and can't save both players in network games. \newline

-The second version used in 1.3.2 can save the replays so they take up less space. But 1.3.2 and newer can only load player one from old replays.

+The second version used in 1.3.2 can save the replays so they take up less space. But 1.3.2 and newer can only load player one from old replays. \newline

+The third version usin in 1.4.0 saves additional information in replays. Version 1.4.0 are not able to read replays from old versions.

\end{document}