From f495f8e833eda4dc022a7b77152fb3752ae013ea Mon Sep 17 00:00:00 2001
From: Lee Salzman <lsalzman@gmail.com>
Date: Mon, 6 Nov 2006 20:13:56 +0000
Subject: [PATCH] no message

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@508 e016b1c5-ed68-44aa-a2f7-31cac88cffde
---
 source/src/editing.cpp     |   9 +++------
 source/src/rendercubes.cpp |   7 +++++--
 source/src/tools.h         |  11 -----------
 source/vcpp/cube.suo       | Bin 68608 -> 72704 bytes
 4 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/source/src/editing.cpp b/source/src/editing.cpp
index e331dfba..43cee263 100644
--- a/source/src/editing.cpp
+++ b/source/src/editing.cpp
@@ -100,12 +100,8 @@ void makesel()
 
 VAR(flrceil,0,0,2);
 
-float sheight(sqr *s, sqr *t, float z)                  // finds out z height when cursor points at wall
-{
-    return !flrceil //z-s->floor<s->ceil-z
-        ? (s->type==FHF ? s->floor-t->vdelta/4.0f : (float)s->floor)
-        : (s->type==CHF ? s->ceil+t->vdelta/4.0f : (float)s->ceil);
-};
+// VC8 optimizer screws up rendering somehow if this is an actual function
+#define sheight(s,t,z) (!flrceil ? (s->type==FHF ? s->floor-t->vdelta/4.0f : (float)s->floor) : (s->type==CHF ? s->ceil+t->vdelta/4.0f : (float)s->ceil))
 
 void cursorupdate()                                     // called every frame from hud
 {
@@ -144,6 +140,7 @@ void cursorupdate()                                     // called every frame fr
 
     for(int ix = cx-GRIDSIZE; ix<=cx+GRIDSIZE; ix++) for(int iy = cy-GRIDSIZE; iy<=cy+GRIDSIZE; iy++)
     {
+
         if(OUTBORD(ix, iy)) continue;
         sqr *s = S(ix,iy);
         if(SOLID(s)) continue;
diff --git a/source/src/rendercubes.cpp b/source/src/rendercubes.cpp
index 25e5fb3f..fa462085 100644
--- a/source/src/rendercubes.cpp
+++ b/source/src/rendercubes.cpp
@@ -15,10 +15,13 @@ void setarraypointers()
 // leaves of all these functions, and are part of the cpu bottleneck on really slow
 // machines, hence the macros.
 
-#define vertf(v1, v2, v3, ls, t1, t2) { vertex &v = verts.add(); \
+#define vertf(v1, v2, v3, ls, t1, t2) { \
+	vertex *buf = verts.getbuf(), &v = verts.add(); \
+	if(buf!=verts.getbuf()) setarraypointers(); \
     v.u = t1; v.v = t2; \
     v.x = v1; v.y = v2; v.z = v3; \
-    v.r = ls->r; v.g = ls->g; v.b = ls->b; v.a = 255; };
+    v.r = ls->r; v.g = ls->g; v.b = ls->b; v.a = 255; \
+};
 
 #define vert(v1, v2, v3, ls, t1, t2) { vertf((float)(v1), (float)(v2), (float)(v3), ls, t1, t2); }
 
diff --git a/source/src/tools.h b/source/src/tools.h
index 0354e1d5..e1aa6706 100644
--- a/source/src/tools.h
+++ b/source/src/tools.h
@@ -424,16 +424,5 @@ struct databuf
 typedef databuf<char> charbuf;
 typedef databuf<uchar> ucharbuf;
 
-#ifndef __GNUC__
-#ifdef _DEBUG
-//#define _CRTDBG_MAP_ALLOC
-#include <crtdbg.h>
-inline void *__cdecl operator new(size_t n, const char *fn, int l) { return ::operator new(n, 1, fn, l); };
-inline void __cdecl operator delete(void *p, const char *fn, int l) { ::operator delete(p, 1, fn, l); };
-#define new new(__FILE__,__LINE__)
-#endif 
-#endif
-
-
 #endif
 
diff --git a/source/vcpp/cube.suo b/source/vcpp/cube.suo
index 972a5781855a582bfbf54a633b9ad8d62d458477..b64f5d689bcd1421fb80572bee9e29551b602d1b 100644
GIT binary patch
delta 3192
zcmZ{mYfx2H7>3t6?sLRz-Vn6`QSpi*7z!Ln1(du3qN!9?f|QmT8a0Vcho<s|mAX>1
zW~#Bj<(N2`mW}3Z8fy^kN0;ehH8sxEWJNYvLGQcIyVV-|nCE<JKl@vIZ`Rstozw8V
z*YK9Nce&TyJXdnzOMA+8Fvc|OXsY*0OKslv7MtGGT5-m6$Gyy^)&=uA+u^>et17qQ
z5hxuNFR5;hy5g?m+;1<<wMFrYmz(FiV_uf4yHw_mRb(}_UV1GY8yPZY6i5f7!5EMM
z#)3?c1;&A!KsFc;CV(7}3)<S-+oQ<&pa9$qCW1*|GAIPBDMp?Grh*c13z!x%C1yGr
zGr&y1!r92BpbV6QIe>mH@;q=Wm=6|!g`g6&ZC(80zBbPrxd8+41b7lW1=fM}U?bo~
zHX%2H%?G-L>^Zx`v&F7BF>7a?XUifc9cKzSRy$igJI@xg8A-wQ9}Btqsx+JFTD(E-
z$opQn5S4xW(<5*?)jM!GY$Fl3e|9vv#w;<*OdVKh?ll>v+SKCDn8UTZdm8sfdhggE
z99hs43<it|fR2$9PbL>RsLPWpl<S3DBsc9EH(jn&j)!G(6>%3cqtTcvd0SkX?#Q>x
zRm<^kiQH1T-pI@3n&f!6U+zsg)*S*7@UC16@&OaWC*la;e|G~o3K%Cr;7<9*m}WU1
zo{?*j>w<h%?qj*G$e+l4ca6J%HXo*y_vcMG{NDq{B|tX-{0<l$Am|vL8Xe_0MG10=
za%pgV<&x#tH$`rsT#T<-s^loifpF<^x!1S?wE5H}a-60-)y<F_3O7@(OfCtoT&_~C
z8{8dM<G)A}&fKZO#d2fds^n_r`ogV}dqj?X*T~h&4ToDR7nAD`*C4mfV*J%M>($t#
z!VDBP%59fRh1(&wTaMH8s@&^x9MwH?hvlHmak&$6iQ^$pN}iUS1oweliyS+jl{;_U
zEA6Q+(@Ss-KSYyj%~G?*Jcxx*jnAuVyfTy+@z?lt4j22*0-Os5hlXwr;7-lpx~AhQ
zC;*&mu3@^dAnFFam$V2Ce-+bm<#TIeCAYJncca`EIS<)^N5M|HeB^S#2o_~8H|PG|
zToYGT;R&>PRW9L^fN>7caliTqFg^!#j4$HJoJXeP|DTUWXXLw)=?cNufWeuk%LW^)
z=}2cb+ile;Hcz{3b|f!^l^1fCvGwNqa`J!#JK5iMi*Twaekw<&yzoR^W0HS*7EU)<
zzvqPDa?>gxzvWH+V1rNjw9G-|;N&4S-j?fux_9JG`>(>zEn%Cs?O1eR4Yql1_N3-t
zFT=wf`W=sN_*{7G-2k|N8JtF4(I05KK5~2+`T<VyY`H{a!YBhl-(WiVjs$Koix4#c
zE@FnDagS?myV32vnBaf^tm1jZGa%^ptZ$47-k?kzZ<X7nx@6=R<boZSkIQ#~k9!gD
zdfZ%tUHBI{uG(LX_Mg8cIW{5m;IEuucjef$(F5+XydZDfi48<&IgVEsxpX=99W9qF
z$3ElH?tz?RvGjPJTR3-G-sF0l;ayked6-@39{(wS$OC4zS&lEn)fm{7$TetPUHb`*
zJuBnW&6USH@M|&*7{NMcJIW74Az&RJs|YZP0UcvXJee8DbgY>vS0%?oeqA&46&*8t
z0B#Xnz#9QOF9g8@?UCcdvCTLLSjWCU0!A>IeE6SzW6U4O!2@2F`%`WO@?ZYcqcH+i
z_{G(ZTf3v}Q~Ot&hfLLfmPk^4O|3s>ZtseOPTVK?4jEVYO;T(y8oUv68ej|s!Oe%E
z?ErUDI{vdG0b>*h>iE6D7z60;0~vs^7SL@0+$S0P09*`HZA=pl;xu3(r{F`t_!Q9X
z0-piK^+tzpGV96#M#GQbw*^;um?setWHqr8H2J~n-ya3R>mOAi|6A^{j8ZwSJN^b>
SR9<<5v$<XU|A+g^>-P`bYGY>r

delta 220
zcmZqJ!O}2;WkU`N--3>VpRO_<XJlpog09U~EPj5IPkhta{3YlD3#$fDOnd4@M(xdC
z!b7-N{sX~efkchXB}oB{tRS8mL^Aoj)nsQ;!^vOfg)rKIg-Yh1594IC1nP%rnq2bD
zfAV1#!_8m5tzn&<@ps0=f)ktmv9NId1FC2SDs0)V%fxt@abkhOG!{l@kkaWTER6na
sjOsv18<45fzpyZdFp7YfY;sHt40TMC9S?YMfNTJPNoP%#u`#j%0D|#ct^fc4