last minute bug.. ;P

diff --git a/bs/fleet.cpp b/bs/fleet.cpp
index 545ffa2e43d094fe09a3490d85d13dacebc29e49..7070dae6d2a719c3162c5d2113237fa4a84b4383 100644 (file)
--- a/bs/fleet.cpp
+++ b/bs/fleet.cpp
@@ -465,7 +465,7 @@ void Fleet::takeEMP(std::string unittype, int number)
 
                        for (map<string, int*>::iterator j = targets.begin(); j != targets.end(); ++j)
                        {
 
                        for (map<string, int*>::iterator j = targets.begin(); j != targets.end(); ++j)
                        {

-                               int maxguns = (*j->second)/total * guns;
+                               float maxguns = float((*j->second))/total * guns;

                                cerr << "Now shooting at target: " << j->first << endl;
 
                                double k = maxguns;
                                cerr << "Now shooting at target: " << j->first << endl;
 
                                double k = maxguns;

diff --git a/bs/planet.cpp b/bs/planet.cpp
index 0e4de71300db0651919b5b36549e5537dbf61dba..c374a99ff9cc7f726fd18392cad21aeb0890a5b2 100644 (file)
--- a/bs/planet.cpp
+++ b/bs/planet.cpp
@@ -172,7 +172,7 @@ void Planet::calcOneTick(Planet* friendly, Fleet* hostile, std::map<std::string,
                
                string unittype = i->second;
 
                
                string unittype = i->second;
 

-               cerr << "Initiative: " << s_Units[unittype].initiative() << " with unit: " << unittype << endl;
+               //cerr << "Initiative: " << s_Units[unittype].initiative() << " with unit: " << unittype << endl;

 
                if (s_Units[unittype].type() == "EMP")  
                {
 
                if (s_Units[unittype].type() == "EMP")  
                {

diff --git a/hbs.kdevprj b/hbs.kdevprj
index 235e017ccf6528c1fd91f1abd4d67f1ec5bd3110..a89c6b851053c52b0b2206e4f2b32da914308a66 100644 (file)
--- a/hbs.kdevprj
+++ b/hbs.kdevprj
@@ -18,21 +18,24 @@ type=DATA
 
 [Config for BinMakefileAm]
 addcxxflags=
 
 [Config for BinMakefileAm]
 addcxxflags=

-bin_program=bs
-cxxflags=-O0 -g3 -Wall
+bin_program=hbs
+cflags=
+cppflags=
+cxxflags=\s-O0 -g3 -Wall

 ldadd=
 ldadd=

-ldflags=
+ldflags=\s

 libtool_dir=
 path_to_bin_program=bs
 
 [General]
 AMChanged=false
 author=Michael Andreen
 libtool_dir=
 path_to_bin_program=bs
 
 [General]
 AMChanged=false
 author=Michael Andreen

+configure_args=\s--build=i386-linux --host=i386-linux --target=i386-linux\s

 dir_where_make_will_be_called=./
 email=whale@linux.nu
 kdevprj_version=1.3
 lfv_open_groups=
 dir_where_make_will_be_called=./
 email=whale@linux.nu
 kdevprj_version=1.3
 lfv_open_groups=

-make_options=-j1 -W/home/whale/c++/gfxtar/blaha
+make_options=\s-j1

 makefiles=Makefile.am,bs/Makefile.am,bs/docs/Makefile.am,bs/docs/en/Makefile.am,po/Makefile.am
 modifyMakefiles=true
 project_name=Bc
 makefiles=Makefile.am,bs/Makefile.am,bs/docs/Makefile.am,bs/docs/en/Makefile.am,po/Makefile.am
 modifyMakefiles=true
 project_name=Bc