Merge pull request #966 from galaxyhaxz/LockBuffer

Rename lock_buf

Source/capture.cpp

@@ -19,7 +19,7 @@ void CaptureScreen()
 #endif
 		RedPalette(palette);
 
-		j_lock_buf_priv(2);
+		lock_buf(2);
 		success = CaptureHdr(hObject, 640, 480);
 		if (success) {
 			success = CapturePix(hObject, 640, 480, 768, &gpBuffer[SCREENXY(0, 0)]);
@@ -27,7 +27,7 @@ void CaptureScreen()
 				success = CapturePal(hObject, palette);
 			}
 		}
-		j_unlock_buf_priv(2);
+		unlock_buf(2);
 		CloseHandle(hObject);
 
 		if (!success)

Source/dx.cpp

@@ -180,7 +180,7 @@ HRESULT dx_DirectDrawCreate(LPGUID guid, LPDIRECTDRAW *lplpDD, LPUNKNOWN pUnkOut
 	return DirectDrawCreate(guid, lplpDD, pUnkOuter);
 }
 
-void j_lock_buf_priv(BYTE idx)
+void lock_buf(BYTE idx)
 {
 #ifdef _DEBUG
 	++locktbl[idx];
@@ -227,7 +227,7 @@ void lock_buf_priv()
 	sgdwLockCount++;
 }
 
-void j_unlock_buf_priv(BYTE idx)
+void unlock_buf(BYTE idx)
 {
 #ifdef _DEBUG
 	if (!locktbl[idx])

Source/dx.h

@@ -15,9 +15,9 @@ void dx_init(HWND hWnd);
 void dx_create_back_buffer();
 void dx_create_primary_surface();
 HRESULT dx_DirectDrawCreate(LPGUID guid, LPDIRECTDRAW *lplpDD, LPUNKNOWN pUnkOuter);
-void j_lock_buf_priv(BYTE idx);
+void lock_buf(BYTE idx);
 void lock_buf_priv();
-void j_unlock_buf_priv(BYTE idx);
+void unlock_buf(BYTE idx);
 void unlock_buf_priv();
 void dx_cleanup();
 void dx_reinit();

Source/interfac.cpp

@@ -36,7 +36,7 @@ void DrawCutscene()
 {
 	DWORD i;
 
-	j_lock_buf_priv(1);
+	lock_buf(1);
 	CelDecodeOnly(64, 639, (BYTE *)sgpBackCel, 1, 640);
 
 	for (i = 0; i < sgdwProgress; i++) {
@@ -46,7 +46,7 @@ void DrawCutscene()
 		    progress_id);
 	}
 
-	j_unlock_buf_priv(1);
+	unlock_buf(1);
 	drawpanflag = 255;
 	scrollrt_draw_game_screen(0);
 }

Source/scrollrt.cpp

@@ -2189,7 +2189,7 @@ void DrawZoom(int x, int y)
 
 void ClearScreenBuffer()
 {
-	j_lock_buf_priv(3);
+	lock_buf(3);
 
 	/// ASSERT: assert(gpBuffer);
 
@@ -2217,7 +2217,7 @@ void ClearScreenBuffer()
 	}
 #endif
 
-	j_unlock_buf_priv(3);
+	unlock_buf(3);
 }
 
 #ifdef _DEBUG
@@ -2318,17 +2318,17 @@ void scrollrt_draw_game_screen(BOOL draw_cursor)
 	}
 
 	if (draw_cursor) {
-		j_lock_buf_priv(0);
+		lock_buf(0);
 		scrollrt_draw_cursor_item();
-		j_unlock_buf_priv(0);
+		unlock_buf(0);
 	}
 
 	DrawMain(hgt, 0, 0, 0, 0, 0);
 
 	if (draw_cursor) {
-		j_lock_buf_priv(0);
+		lock_buf(0);
 		scrollrt_draw_cursor_back_buffer();
-		j_unlock_buf_priv(0);
+		unlock_buf(0);
 	}
 }
 // 52571C: using guessed type int drawpanflag;
@@ -2639,7 +2639,7 @@ void DoBlitScreen(DWORD dwX, DWORD dwY, DWORD dwWdt, DWORD dwHgt)
 		nDstWdt = DDS_desc.lPitch - dwWdt;
 		dwWdt >>= 2;
 
-		j_lock_buf_priv(6);
+		lock_buf(6);
 
 		/// ASSERT: assert(gpBuffer);
 
@@ -2674,7 +2674,7 @@ void DoBlitScreen(DWORD dwX, DWORD dwY, DWORD dwWdt, DWORD dwHgt)
 		}
 #endif
 
-		j_unlock_buf_priv(6);
+		unlock_buf(6);
 	}
 }
 
@@ -2705,7 +2705,7 @@ void DrawAndBlit()
 
 	drawpanflag = 0;
 
-	j_lock_buf_priv(0);
+	lock_buf(0);
 	if(leveltype != DTYPE_TOWN) {
 		DrawView(ViewX, ViewY);
 	} else {
@@ -2731,13 +2731,13 @@ void DrawAndBlit()
 		hgt = 480;
 	}
 	scrollrt_draw_cursor_item();
-	j_unlock_buf_priv(0);
+	unlock_buf(0);
 
 	DrawMain(hgt, ddsdesc, drawhpflag, drawmanaflag, drawsbarflag, drawbtnflag);
 
-	j_lock_buf_priv(0);
+	lock_buf(0);
 	scrollrt_draw_cursor_back_buffer();
-	j_unlock_buf_priv(0);
+	unlock_buf(0);
 
 	drawhpflag = FALSE;
 	drawmanaflag = FALSE;