Improve folder structure and update nquake.ini URL.

Author: niclaslindstedt

.gitignore

@@ -1,29 +1,6 @@
 # Compiled source #
 ###################
-*.com
-*.class
-*.dll
-*.o
-*.so
-
-# Packages #
-############
-# it's better to unpack these files and commit the raw source
-# git has its own built in compression methods
-*.7z
-*.dmg
-*.gz
-*.iso
-*.jar
-*.rar
-*.tar
-*.zip
-
-# Logs and databases #
-######################
-*.log
-*.sql
-*.sqlite
+src/*.dll
 
 # OS generated files #
 ######################

README.md

@@ -0,0 +1,18 @@
+nQuake Server for Windows
+======
+
+To compile an nQuake Server installer, follow these steps:
+
+1) Download NSIS (http://nsis.sourceforge.net/) - version 2.x or v3.0+ doesn't matter.<br>
+2) Copy/move the folders in the `include` folder to `C:\Program Files (x86)\NSIS\`.<br>
+_For NSIS v3.0+ you need to move the plugins (.dll files) to the "x86-ansi" subfolder of "Plugins"._<br>
+3) Right-click the `nquakesv-installer_source.nsi` file and open with makensisw.exe.<br>
+
+Tips:<br>
+* Most of the code resides in `nquakesv-installer_source.nsi` but some code that is used often can be found in `nquake-macros.nsh`.<br>
+* Edit the contents of the installer pages in the .ini files and their functions in the installer source file (e.g. Function DOWNLOAD for the download page).<br>
+
+If you decide to fork nQuakesv into your own installer, I would love to get some credit, but since this is GPL I can't force you :)
+
+-
+2016-07-01

Include/Locate.nsh include/Include/Locate.nsh

@@ -1,14 +1,15 @@
 ;nQuakesv NSIS Online Installer Script
-;By Empezar 2013-08-03; Last modified 2014-03-16
+;By Empezar 2013-08-03; Last modified 2016-07-01
 
-!define VERSION "1.6"
-!define SHORTVERSION "16"
+!define VERSION "1.7"
+!define SHORTVERSION "17"
 
 Name "nQuakesv"
 OutFile "nquakesv${SHORTVERSION}_installer.exe"
 InstallDir "C:\nQuakesv"
 
-!define INSTALLER_URL "http://nquake.com" # Note: no trailing slash!
+!define NQUAKE_URL "http://nquake.com" # Note: no trailing slash!
+!define NQUAKE_INI_URL "https://raw.githubusercontent.com/nQuake/client-win32/master/etc/nquake.ini" # Note: no trailing slash!
 !define DISTFILES_PATH "$LOCALAPPDATA\nQuakesv\" # Note: no trailing slash!
 
 # Editing anything below this line is not recommended
@@ -1368,7 +1369,7 @@ Function .onInit
 
   # Download nquake.ini
   Start:
-  inetc::get /NOUNLOAD /CAPTION "Initializing..." /BANNER "nQuakesv is initializing, please wait..." /TIMEOUT 5000 "${INSTALLER_URL}/nquake.ini" $NQUAKE_INI /END
+  inetc::get /NOUNLOAD /CAPTION "Initializing..." /BANNER "nQuakesv is initializing, please wait..." /TIMEOUT 5000 "${NQUAKE_INI_URL}" $NQUAKE_INI /END
   Pop $0
   ${Unless} $0 == "OK"
     ${If} $0 == "Cancelled"
@@ -1398,7 +1399,7 @@ Function .onInit
   ${VersionCompare} $R0 $0 $1
   ${If} $1 == 2
     MessageBox MB_YESNO|MB_ICONEXCLAMATION "A newer version of nQuakesv is available.$\r$\n$\r$\nDo you wish to be taken to the download page?" IDNO ContinueInstall
-    ExecShell "open" ${INSTALLER_URL}
+    ExecShell "open" ${NQUAKE_URL}
     Abort
   ${EndIf}
   ContinueInstall: