diff --git a/polymer/eduke32/MakeDistributions b/polymer/eduke32/MakeDistributions index f5e023608..8d1f6ebe3 100644 --- a/polymer/eduke32/MakeDistributions +++ b/polymer/eduke32/MakeDistributions @@ -1,12 +1,12 @@ # GNU Makefile to prepare source and binary distributions. # make -f MakeDistributions [source|binary] -SOURCEFILES=GNU.TXT \ +SOURCEFILES=GNU.TXT buildlic.txt \ Makefile Makefile.deps Makefile.msvc Makefile.watcom MakeDistributions \ makemsc.bat makew.bat ChangeLog.html duke3d.def.sample \ SEHELP.HLP STHELP.HLP ChangeLog enhance.con.sample -BINARYFILES=mapster32.exe eduke32.exe GNU.TXT \ +BINARYFILES=mapster32.exe eduke32.exe GNU.TXT buildlic.txt \ ChangeLog.html setup.exe duke3d.def.sample SEHELP.HLP STHELP.HLP \ ChangeLog enhance.con.sample duke3d_w32.exe diff --git a/polymer/eduke32/buildlic.txt b/polymer/eduke32/buildlic.txt new file mode 100755 index 000000000..3a3985bb6 --- /dev/null +++ b/polymer/eduke32/buildlic.txt @@ -0,0 +1,71 @@ +BUILD SOURCE CODE LICENSE TERMS: 06/20/2000 + +[1] I give you permission to make modifications to my Build source and + distribute it, BUT: + +[2] Any derivative works based on my Build source may be distributed ONLY + through the INTERNET. + +[3] Distribution of any derivative works MUST be done completely FREE of + charge - no commercial exploitation whatsoever. + +[4] Anything you distribute which uses a part of my Build Engine source + code MUST include: + + [A] The following message somewhere in the archive: + + // "Build Engine & Tools" Copyright (c) 1993-1997 Ken Silverman + // Ken Silverman's official web site: "http://www.advsys.net/ken" + // See the included license file "BUILDLIC.TXT" for license info. + + [B] This text file "BUILDLIC.TXT" along with it. + + [C] Any source files that you modify must include this message as well: + + // This file has been modified from Ken Silverman's original release + +[5] The use of the Build Engine for commercial purposes will require an + appropriate license arrangement with me. Contact information is + on my web site. + +[6] I take no responsibility for damage to your system. + +[7] Technical support: Before contacting me with questions, please read + and do ALL of the following! + + [A] Look through ALL of my text files. There are 7 of them (including this + one). I like to think that I wrote them for a reason. You will find + many of your answers in the history section of BUILD.TXT and + BUILD2.TXT (they're located inside SRC.ZIP). + + [B] If that doesn't satisfy you, then try going to: + + "http://www.advsys.net/ken/buildsrc" + + where I will maintain a Build Source Code FAQ (or perhaps I might + just provide a link to a good FAQ). + + [C] I am willing to respond to questions, but ONLY if they come at a rate + that I can handle. + + PLEASE TRY TO AVOID ASKING DUPLICATE QUESTIONS! + + As my line of defense, I will post my current policy about + answering Build source questions (right below the E-mail address + on my web site.) You can check there to see if I'm getting + overloaded with questions or not. + + If I'm too busy, it might say something like this: + + I'm too busy to answer Build source questions right now. + Sorry, but don't expect a reply from me any time soon. + + If I'm open for Build source questions, please state your question + clearly and don't include any unsolicited attachments unless + they're really small (like less than 50k). Assume that I have + a 28.8k modem. Also, don't leave out important details just + to make your question appear shorter - making me guess what + you're asking doesn't save me time! + +---------------------------------------------------------------------------- +-Ken S. (official web site: http://www.advsys.net/ken) diff --git a/polymer/eduke32/installer/eduke32.nsi b/polymer/eduke32/installer/eduke32.nsi index 69454760d..24531bfa5 100755 --- a/polymer/eduke32/installer/eduke32.nsi +++ b/polymer/eduke32/installer/eduke32.nsi @@ -73,7 +73,8 @@ Section "!Game" SEC_GAME File "..\eduke32.exe" CreateDirectory "$SMPROGRAMS\$ICONS_GROUP" CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\EDuke32.lnk" "$INSTDIR\eduke32.exe" - File "..\GNU.TXT" + File "..\GNU.TXT" + File "..\buildlic.txt" File "..\ChangeLog.html" File "..\ChangeLog" File "..\setup.exe" @@ -149,7 +150,8 @@ Section Uninstall Delete "$INSTDIR\setup.exe" Delete "$INSTDIR\ChangeLog.html" Delete "$INSTDIR\ChangeLog" - Delete "$INSTDIR\GNU.TXT" + Delete "$INSTDIR\GNU.TXT" + Delete "$INSTDIR\buildlic.txt" Delete "$INSTDIR\eduke32.exe" Delete "$INSTDIR\duke3d_w32.exe" ; Delete "$INSTDIR\datainst.exe" diff --git a/polymer/eduke32/source/premap.c b/polymer/eduke32/source/premap.c index c77feb212..a336d1c2c 100644 --- a/polymer/eduke32/source/premap.c +++ b/polymer/eduke32/source/premap.c @@ -326,8 +326,8 @@ void cacheit(void) if (waloff[i] == 0) loadtile((short)i); -#ifdef POLYMOST - if (useprecache) { +#if defined(POLYMOST) && defined(USE_OPENGL) + if (useprecache && !KB_KeyPressed(sc_Space)) { if (precachehightile[0][i>>3] & pow2char[i&7]) for (k=0; k