kallaballa

make -C src/  -- LD=m68k-amigaos-ld CXX=m68k-amigaos-g++ CXX=m68k-amigaos-g++ 
make[1]: Entering directory '/home/elchaschab/devel/FractalDive/src'
m68k-amigaos-g++ -std=c++0x -pedantic -Wall -fno-rtti -fno-exceptions -DDEBUG -D_AMIGA -D_NO_THREADS -D_FIXEDPOINT -mcrt=nix13 -Wa,-march=68030 -Wa,-mcpu=68030 -march=68030 -mtune=68030 -mcpu=68030 -fbbb=+ -Os -w -c  -Os -w `pkg-config --cflags sdl` -o main.o -c main.cpp 
In file included from /opt/amiga/lib/gcc/m68k-amigaos/6.5.0b/include/c++/string:41:0,
                 from /opt/amiga/lib/gcc/m68k-amigaos/6.5.0b/include/c++/bits/locale_classes.h:40,
                 from /opt/amiga/lib/gcc/m68k-amigaos/6.5.0b/include/c++/bits/ios_base.h:41,
                 from /opt/amiga/lib/gcc/m68k-amigaos/6.5.0b/include/c++/ios:42,
                 from /opt/amiga/lib/gcc/m68k-amigaos/6.5.0b/include/c++/ostream:38,
                 from MFixedPoint/FpF.hpp:23,
                 from types.hpp:9,

kallaballa

void command_executor_default::surrender_game()
{
	using namespace gui2::dialogs;
	message dialog(_("Quit"), _("Do you really want to quit?"),
					 false,
					 false,
					 false);

	dialog.set_button_visible(message::ok, gui2::widget::visibility::visible);
	dialog.set_button_visible(message::left_1, gui2::widget::visibility::visible);

kallaballa

diff --git a/src/playsingle_controller.cpp b/src/playsingle_controller.cpp
index 2ed9ef8d88..3e7381b5c9 100644
--- a/src/playsingle_controller.cpp
+++ b/src/playsingle_controller.cpp
@@ -605,15 +605,12 @@ void playsingle_controller::play_network_turn()
 	ERR_NG << "Networked team encountered by playsingle_controller." << std::endl;
 }
 
-
 void playsingle_controller::handle_generic_event(const std::string& name){

kallaballa

diff --git a/src/replay.cpp b/src/replay.cpp
index 83c506e45d..9613524904 100644
--- a/src/replay.cpp
+++ b/src/replay.cpp
@@ -226,6 +226,13 @@ void replay::add_start()
        cmd.add_child("start");
 }
 
+void replay::add_surrender()
+{

kallaballa

diff --git a/data/core/hotkeys.cfg b/data/core/hotkeys.cfg
index 8ca658bdd4..58a9b9d7e5 100644
--- a/data/core/hotkeys.cfg
+++ b/data/core/hotkeys.cfg
@@ -374,6 +374,13 @@
 #endif
 
 [hotkey]
+    command="surrender"
+    key="s"

kallaballa

attacker="`xml sel -t -v "/root/replay/command[@sent=''][last()]/attack/@attacker_type" -n "$XML"`"
defender="`xml sel -t -v "/root/replay/command[@sent=''][last()]/attack/@defender_type" -n "$XML"`"
checkup_cnt="`xml sel -t -v "count(/root/replay/command[@sent=''][last()]/checkup/result[@hits])" -n "$XML"`"

kallaballa

<command sent="" >
<attack attacker_lvl="1" attacker_type="Dwarvish Ulfserker" defender_lvl="2" defender_type="Lieutenant" defender_weapon="0" tod="morning" turn="2" weapon="0" >
<source x="3" y="4" >
</source>
<destination x="4" y="3" >
</destination>
</attack>
<checkup >
<result chance="60" damage="5" hits="yes" >
</result>

kallaballa

%!PS-Adobe-3.0
/=== { (        ) cvs print } def
/stroke { currentlinewidth matrix currentmatrix 0 get mul 1,900000 lt {(P)=== currentrgbcolor pop pop 100 mul round cvi = flattenpath {transform (M)=== 1 sub round cvi === (,)=== 1 sub round cvi =}{transform (L)=== 1 sub round cvi === (,)=== 1 sub round cvi =}{}{(C)=}pathforall newpath}{stroke}ifelse } bind def
/showpage { (X)= showpage } bind def
%%Creator: cairo 1.13.1 (http://cairographics.org)
%%CreationDate: Sat Nov 22 16:51:36 2014
%%Pages: 1
%%DocumentData: Clean7Bit
%%LanguageLevel: 2
%%DocumentMedia: 50x50mm 142 142 0 () ()

kallaballa

<?xml version="1.0" encoding="UTF-8"?>
<!-- 2013-02-08 19:59:35 Generated by QCAD SVG Exporter -->
<svg width="56mm" height="145.956mm" viewBox="-5 -117.956 56 145.956" version="1.1" xmlns="http://www.w3.org/2000/svg" style="stroke-linecap:round;stroke-linejoin:round;fill:none">
    <g transform="scale(1,-1)">
        <!-- Line -->
        <path d="M39,12 L39,60 " style="stroke:#ff0000;stroke-width:0.25;"/>
        <!-- Line -->
        <path d="M9,60 L9,12 " style="stroke:#ff0000;stroke-width:0.25;"/>
        <!-- Line -->
        <path d="M32,12 L16,12 " style="stroke:#ff0000;stroke-width:0.25;"/>

kallaballa

git clone git://github.com/Metalab/JavaForFunAndProfit.git