--- a/QTfrontend/hwform.cpp Sat Aug 18 13:39:24 2012 +0200
+++ b/QTfrontend/hwform.cpp Sat Aug 18 13:40:21 2012 +0200
@@ -203,7 +203,7 @@
connect(ui.pageFeedback->BtnSend, SIGNAL(clicked()), this, SLOT(SendFeedback()));
- connect(ui.pageEditTeam, SIGNAL(teamEdited()), this, SLOT(AfterTeamEdit()));
+ connect(ui.pageEditTeam, SIGNAL(goBack()), this, SLOT(AfterTeamEdit()));
connect(ui.pageMultiplayer->BtnStartMPGame, SIGNAL(clicked()), this, SLOT(StartMPGame()));
connect(ui.pageMultiplayer->teamsSelect, SIGNAL(setEnabledGameStart(bool)),
@@ -878,7 +878,7 @@
void HWForm::AfterTeamEdit()
{
UpdateTeamsLists();
- GoBack();
+ //GoBack();
}
--- a/QTfrontend/ui/page/pageeditteam.cpp Sat Aug 18 13:39:24 2012 +0200
+++ b/QTfrontend/ui/page/pageeditteam.cpp Sat Aug 18 13:40:21 2012 +0200
@@ -472,5 +472,4 @@
void PageEditTeam::saveTeam()
{
data().saveToFile();
- emit teamEdited();
}
--- a/QTfrontend/ui/page/pageeditteam.h Sat Aug 18 13:39:24 2012 +0200
+++ b/QTfrontend/ui/page/pageeditteam.h Sat Aug 18 13:40:21 2012 +0200
@@ -40,9 +40,6 @@
void editTeam(const QString & name, const QString & playerHash);
void deleteTeam(const QString & name);
- signals:
- void teamEdited();
-
public slots:
void CBFort_activated(const QString & gravename);
--- a/hedgewars/uLand.pas Sat Aug 18 13:39:24 2012 +0200
+++ b/hedgewars/uLand.pas Sat Aug 18 13:40:21 2012 +0200
@@ -782,7 +782,9 @@
LandBackSurface:= nil;
digest:= '';
-
+ LAND_WIDTH:= 0;
+ LAND_HEIGHT:= 0;
+(*
if (cReducedQuality and rqBlurryLand) = 0 then
SetLength(LandPixels, LAND_HEIGHT, LAND_WIDTH)
else
@@ -790,6 +792,7 @@
SetLength(Land, LAND_HEIGHT, LAND_WIDTH);
SetLength(LandDirty, (LAND_HEIGHT div 32), (LAND_WIDTH div 32));
+*)
end;
procedure freeModule;