From 1d4ea9f16286c600514982e6d22f2ebc36b6192f Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Thu, 8 May 2014 09:48:39 +0200 Subject: [PATCH] - removed the __asm nop breakpoints for debugging. They not only do not work on non-MSVC but also not on 64 bit. --- src/gl/data/gl_setup.cpp | 4 +--- src/gl/scene/gl_bsp.cpp | 12 +++++------- src/gl/scene/gl_fakeflat.cpp | 4 +--- src/gl/scene/gl_flats.cpp | 14 ++++---------- src/gl/scene/gl_walls.cpp | 12 ++++++------ src/gl/scene/gl_walls_draw.cpp | 6 +++--- 6 files changed, 20 insertions(+), 32 deletions(-) diff --git a/src/gl/data/gl_setup.cpp b/src/gl/data/gl_setup.cpp index 342f58fa1f..a76e618d9a 100644 --- a/src/gl/data/gl_setup.cpp +++ b/src/gl/data/gl_setup.cpp @@ -312,13 +312,11 @@ static void PrepareTransparentDoors(sector_t * sector) int i; sector_t * nextsec=NULL; -#ifdef _MSC_VER #ifdef _DEBUG if (sector-sectors==2) { - __asm nop + int a = 0; } -#endif #endif P_Recalculate3DFloors(sector); diff --git a/src/gl/scene/gl_bsp.cpp b/src/gl/scene/gl_bsp.cpp index b8a1eeec02..5bdb99b880 100644 --- a/src/gl/scene/gl_bsp.cpp +++ b/src/gl/scene/gl_bsp.cpp @@ -96,11 +96,11 @@ static sector_t *currentsector; static void AddLine (seg_t *seg) { -#ifdef _MSC_VER #ifdef _DEBUG - if (seg->linedef-lines==38) - __asm nop -#endif + if (seg->linedef - lines == 38) + { + int a = 0; + } #endif angle_t startAngle, endAngle; @@ -382,13 +382,11 @@ static void DoSubsector(subsector_t * sub) //if (!clipper.CheckBox(sub->bbox)) return; -#ifdef _MSC_VER #ifdef _DEBUG if (sub->sector-sectors==931) { - __asm nop + int a = 0; } -#endif #endif sector=sub->sector; diff --git a/src/gl/scene/gl_fakeflat.cpp b/src/gl/scene/gl_fakeflat.cpp index 122bae0e63..d46449ddb9 100644 --- a/src/gl/scene/gl_fakeflat.cpp +++ b/src/gl/scene/gl_fakeflat.cpp @@ -218,13 +218,11 @@ sector_t * gl_FakeFlat(sector_t * sec, sector_t * dest, area_t in_area, bool bac return sec; } -#ifdef _MSC_VER #ifdef _DEBUG if (sec-sectors==560) { - __asm nop + int a = 0; } -#endif #endif if (in_area==area_above) diff --git a/src/gl/scene/gl_flats.cpp b/src/gl/scene/gl_flats.cpp index 441c8b73f1..3efdcba8bb 100644 --- a/src/gl/scene/gl_flats.cpp +++ b/src/gl/scene/gl_flats.cpp @@ -334,11 +334,11 @@ void GLFlat::Draw(int pass) int i; int rel = getExtraLight(); -#ifdef _MSC_VER #ifdef _DEBUG if (sector->sectornum == 2) - __asm nop -#endif + { + int a = 0; + } #endif @@ -572,17 +572,11 @@ void GLFlat::ProcessSector(sector_t * frontsector) { lightlist_t * light; -#ifdef _MSC_VER #ifdef _DEBUG - if (frontsector==NULL) - { - __asm int 3 - } if (frontsector->sectornum==0) { - __asm nop + int a = 0; } -#endif #endif // Get the real sector for this one. diff --git a/src/gl/scene/gl_walls.cpp b/src/gl/scene/gl_walls.cpp index 6c8b327668..c65e1aa3be 100644 --- a/src/gl/scene/gl_walls.cpp +++ b/src/gl/scene/gl_walls.cpp @@ -311,11 +311,11 @@ void GLWall::SplitWall(sector_t * frontsector, bool translucent) } ::SplitWall.Clock(); -#ifdef _MSC_VER #ifdef _DEBUG if (seg->linedef-lines==1) - __asm nop -#endif + { + int a = 0; + } #endif if (lightlist.Size()>1) @@ -1445,11 +1445,11 @@ void GLWall::Process(seg_t *seg, sector_t * frontsector, sector_t * backsector) sector_t * realfront; sector_t * realback; -#ifdef _MSC_VER #ifdef _DEBUG if (seg->linedef-lines==636) - __asm nop -#endif + { + int a = 0; + } #endif // note: we always have a valid sidedef and linedef reference when getting here. diff --git a/src/gl/scene/gl_walls_draw.cpp b/src/gl/scene/gl_walls_draw.cpp index d974750295..c71e23a20c 100644 --- a/src/gl/scene/gl_walls_draw.cpp +++ b/src/gl/scene/gl_walls_draw.cpp @@ -459,11 +459,11 @@ void GLWall::Draw(int pass) FLightNode * node; int rel; -#ifdef _MSC_VER #ifdef _DEBUG if (seg->linedef-lines==879) - __asm nop -#endif + { + int a = 0; + } #endif