will fix this http://code.google.com/p/hedgewars/source/detail?r=9f0e79ab51f00f3b1e133ae70cdd63f6963439c0 and will allow hedgewars to build without video recording enabled, for the time being although i want to talk to koda or someone to understand what should be #ifdef'd and if i've done too much or too little.. but at least that will let it build
--- a/QTfrontend/gameuiconfig.cpp Fri Dec 07 11:05:17 2012 -0500
+++ b/QTfrontend/gameuiconfig.cpp Fri Dec 07 16:03:53 2012 -0500
@@ -56,7 +56,9 @@
resizeToConfigValues();
reloadValues();
+#ifdef VIDEOREC
reloadVideosValues();
+#endif
}
void GameUIConfig::reloadValues(void)
--- a/QTfrontend/hwform.cpp Fri Dec 07 11:05:17 2012 -0500
+++ b/QTfrontend/hwform.cpp Fri Dec 07 16:03:53 2012 -0500
@@ -1598,7 +1598,9 @@
xfire_free();
#endif
config->SaveOptions();
+#if VIDEOREC
config->SaveVideosOptions();
+#endif
event->accept();
}
--- a/QTfrontend/ui/page/pageoptions.h Fri Dec 07 11:05:17 2012 -0500
+++ b/QTfrontend/ui/page/pageoptions.h Fri Dec 07 16:03:53 2012 -0500
@@ -85,7 +85,6 @@
QLineEdit * leProxyLogin;
QLineEdit * leProxyPassword;
-#ifdef VIDEOREC
QComboBox *framerateBox;
QSpinBox *bitrateBox;
QLineEdit *widthEdit;
@@ -105,7 +104,6 @@
void setDefaultCodecs();
bool tryCodecs(const QString & format, const QString & vcodec, const QString & acodec);
void setConfig(GameUIConfig * config);
-#endif
void setTeamOptionsEnabled(bool enabled);
@@ -129,13 +127,11 @@
QPushButton *BtnDeleteTeam;
QList<QPushButton *> m_colorButtons;
-#ifdef VIDEOREC
QComboBox *comboAVFormats;
QComboBox *comboVideoCodecs;
QComboBox *comboAudioCodecs;
QPushButton *btnDefaults;
GameUIConfig * config;
-#endif
private slots:
void forceFullscreen(int index);
@@ -149,14 +145,12 @@
void colorButtonClicked(int i);
void onColorModelDataChanged(const QModelIndex & topLeft, const QModelIndex & bottomRight);
void onProxyTypeChanged();
-#ifdef VIDEOREC
void changeAVFormat(int index);
void changeUseGameRes(int state);
void changeRecordAudio(int state);
public slots:
void setDefaultOptions();
-#endif
};
#endif
--- a/hedgewars/uLand.pas Fri Dec 07 11:05:17 2012 -0500
+++ b/hedgewars/uLand.pas Fri Dec 07 16:03:53 2012 -0500
@@ -631,7 +631,7 @@
if Land[y, x] <> 0 then
begin
inc(c);
- if c > 1000 then // avoid accidental triggering
+ if c > (LAND_WIDTH div 2) then // avoid accidental triggering
begin
hasBorder:= true;
break;