Pixellight

Source/all.h

@@ -2,6 +2,9 @@
 #define __ALL_H__
 
 #include <SDL.h>
+#include <vector>
+#include <map>
+#include <string>
 
 #ifdef USE_SDL1
 #include "sdl2_to_1_2_backports.h"

Source/capture.cpp

@@ -141,7 +141,27 @@ void CaptureScreen()
 
 	std::ofstream *out = CaptureFile(FileName);
 	if (out == nullptr) return;
+#ifdef PIXEL_LIGHT
+	//disables per pixel light during screenshot
+	int tmp1 = testvar1;
+	int tmp2 = testvar2;
+	int tmp3 = testvar3;
+	int tmp4 = testvar4;
+	int tmp5 = testvar5;
+	testvar1 = 0;
+	testvar2 = 8;
+	testvar3 = 0;
+	testvar4 = 0;
+	testvar5 = 0;
+#endif
 	DrawAndBlit();
+#ifdef PIXEL_LIGHT
+	testvar1 = tmp1;
+	testvar2 = tmp2;
+	testvar3 = tmp3;
+	testvar4 = tmp4;
+	testvar5 = tmp5;
+#endif
 	PaletteGetEntries(256, palette);
 	RedPalette();
 

Source/control.cpp

@@ -1688,6 +1688,10 @@ void RedBack()
 {
 	int idx;
 
+#ifdef PIXEL_LIGHT
+	drawRed = true;
+	return;
+#endif
 	idx = light4flag ? 1536 : 4608;
 
 	/// ASSERT: assert(gpBuffer);

Source/diablo.cpp

@@ -202,6 +202,10 @@ void run_game_loop(unsigned int uMsg)
 	SetCursor_(CURSOR_NONE);
 	ClearScreenBuffer();
 	force_redraw = 255;
+#ifdef PIXEL_LIGHT
+	//deals with the transition while quitting diablo
+	redrawLights = 1;
+#endif
 	scrollrt_draw_game_screen(TRUE);
 	saveProc = SetWindowProc(saveProc);
 	/// ASSERT: assert(saveProc == GM_Game);
@@ -1157,30 +1161,55 @@ void PressChar(int vkey)
 		return;
 	case '!':
 	case '1':
+#if defined PIXEL_LIGHT && defined _DEBUG
+		testvar1 = ++testvar1 % 3;
+		CalcPlrItemVals(myplr, FALSE);
+		return;
+#endif
 		if (plr[myplr].SpdList[0]._itype != ITYPE_NONE && plr[myplr].SpdList[0]._itype != ITYPE_GOLD) {
 			UseInvItem(myplr, INVITEM_BELT_FIRST);
 		}
 		return;
 	case '@':
 	case '2':
+#if defined PIXEL_LIGHT && defined _DEBUG
+		testvar2 = ++testvar2 % 10;
+		CalcPlrItemVals(myplr, FALSE);
+		return;
+#endif
 		if (plr[myplr].SpdList[1]._itype != ITYPE_NONE && plr[myplr].SpdList[1]._itype != ITYPE_GOLD) {
 			UseInvItem(myplr, INVITEM_BELT_FIRST + 1);
 		}
 		return;
 	case '#':
 	case '3':
+#if defined PIXEL_LIGHT && defined _DEBUG
+		testvar3 = ++testvar3 % 2;
+		CalcPlrItemVals(myplr, FALSE);
+		return;
+#endif
 		if (plr[myplr].SpdList[2]._itype != ITYPE_NONE && plr[myplr].SpdList[2]._itype != ITYPE_GOLD) {
 			UseInvItem(myplr, INVITEM_BELT_FIRST + 2);
 		}
 		return;
 	case '$':
 	case '4':
+#if defined PIXEL_LIGHT && defined _DEBUG
+		testvar4 = ++testvar4 % 2;
+		CalcPlrItemVals(myplr, FALSE);
+		return;
+#endif
 		if (plr[myplr].SpdList[3]._itype != ITYPE_NONE && plr[myplr].SpdList[3]._itype != ITYPE_GOLD) {
 			UseInvItem(myplr, INVITEM_BELT_FIRST + 3);
 		}
 		return;
 	case '%':
 	case '5':
+#if defined PIXEL_LIGHT && defined _DEBUG
+		testvar5 = ++testvar5 % 4;
+		CalcPlrItemVals(myplr, FALSE);
+		return;
+#endif
 		if (plr[myplr].SpdList[4]._itype != ITYPE_NONE && plr[myplr].SpdList[4]._itype != ITYPE_GOLD) {
 			UseInvItem(myplr, INVITEM_BELT_FIRST + 4);
 		}
@@ -1700,6 +1729,10 @@ void timeout_cursor(BOOL bTimeout)
 			SetCursor_(CURSOR_HOURGLASS);
 			force_redraw = 255;
 		}
+#ifdef PIXEL_LIGHT
+		//deals with the lights while lagging
+		redrawLights = 1;
+#endif
 		scrollrt_draw_game_screen(TRUE);
 	} else if (sgnTimeoutCurs) {
 		SetCursor_(sgnTimeoutCurs);

Source/gamemenu.cpp

@@ -101,9 +101,16 @@ void gamemenu_new_game(BOOL bActivate)
 
 	deathflag = FALSE;
 	force_redraw = 255;
+#ifdef PIXEL_LIGHT
+	//deals with the transition when choosing new game from ingame menu
+	redrawLights = 1;
+#endif
 	scrollrt_draw_game_screen(TRUE);
 	gbRunGame = FALSE;
 	gamemenu_off();
+#ifdef PIXEL_LIGHT
+	staticLights.clear();
+#endif
 }
 
 void gamemenu_quit_game(BOOL bActivate)

Source/interfac.cpp

@@ -69,6 +69,10 @@ void ShowProgress(unsigned int uMsg)
 
 	gbSomebodyWonGameKludge = FALSE;
 	plrmsg_delay(TRUE);
+#ifdef PIXEL_LIGHT
+	// disables light system till next DrawAndBlit which renders the dungeon
+	redrawLights = -1;
+#endif
 
 	/// ASSERT: assert(ghMainWnd);
 	saveProc = SetWindowProc(DisableInputWndProc);

Source/items.cpp

@@ -321,6 +321,9 @@ void CalcPlrItemVals(int p, BOOL Loadgfx)
 	int ghit = 0; // increased damage from enemies
 
 	int lrad = 10; // light radius
+#ifdef PIXEL_LIGHT
+	lrad = 2 + testvar2;
+#endif
 
 	int ihp = 0;   // increased HP
 	int imana = 0; // increased mana

Source/lighting.cpp

@@ -522,6 +522,37 @@ void DoLighting(int nXPos, int nYPos, int nRadius, int Lnum)
 	block_x = 0;
 	block_y = 0;
 
+#ifdef PIXEL_LIGHT
+	if (Lnum == -1) {
+		bool updated = false;
+		int color = lightColorMap["STATICLIGHT"];
+		if (setlevel && setlvlnum == SL_POISONWATER) {
+			if (quests[QTYPE_PW]._qactive == 3) {
+				color = lightColorMap["CLEAREDWATER"];
+			} else {
+				color = lightColorMap["POISONEDWATER"];
+			}
+		}
+		for (int i = 0; i < staticLights[currlevel + setlvlnum * (32 * setlevel)].size(); i++) {
+			LightListStruct *it = &staticLights[currlevel + setlvlnum * (32 * setlevel)][i];
+			if (it->_lx == nXPos && it->_ly == nYPos) {
+				it->_lradius = nRadius;
+				it->_lcolor = color;
+				updated = true;
+				break;
+			}
+		}
+		if (!updated){
+			LightListStruct tmp;
+			tmp._lx = nXPos;
+			tmp._ly = nYPos;
+			tmp._lradius = nRadius;
+			tmp._lcolor = color;
+			staticLights[currlevel + setlvlnum * (32 * setlevel)].push_back(tmp);
+		}
+	}
+
+#endif
 	if (Lnum >= 0) {
 		xoff = LightList[Lnum]._xoff;
 		yoff = LightList[Lnum]._yoff;
@@ -1019,7 +1050,11 @@ void InitLighting()
 	}
 }
 
+#ifdef PIXEL_LIGHT
+int AddLight(int x, int y, int r, int color)
+#else
 int AddLight(int x, int y, int r)
+#endif
 {
 	int lid;
 
@@ -1038,6 +1073,9 @@ int AddLight(int x, int y, int r)
 		LightList[lid]._yoff = 0;
 		LightList[lid]._ldel = 0;
 		LightList[lid]._lunflag = 0;
+#ifdef PIXEL_LIGHT
+		LightList[lid]._lcolor = color;
+#endif
 		dolighting = TRUE;
 	}
 

Source/lighting.h

@@ -29,7 +29,11 @@ void ToggleLighting();
 #endif
 void InitLightMax();
 void InitLighting();
+#ifdef PIXEL_LIGHT
+int AddLight(int x, int y, int r, int color = 0xFFFFFF);
+#else
 int AddLight(int x, int y, int r);
+#endif
 void AddUnLight(int i);
 void ChangeLightRadius(int i, int r);
 void ChangeLightXY(int i, int x, int y);

Source/loadsave.cpp

@@ -4,6 +4,9 @@ DEVILUTION_BEGIN_NAMESPACE
 
 BYTE *tbuff;
 
+#ifdef PIXEL_LIGHT
+void CopyInt(const void *src, void *dst);
+#endif
 void LoadGame(BOOL firstflag)
 {
 	int i, j;
@@ -14,6 +17,29 @@ void LoadGame(BOOL firstflag)
 
 	FreeGameMem();
 	pfile_remove_temp_files();
+#ifdef PIXEL_LIGHT
+	staticLights.clear();
+	int mapSize;
+	LoadBuff = pfile_read("staticlights", &dwLen);
+	if (LoadBuff != NULL) {
+		tbuff = LoadBuff;
+		CopyInt(tbuff, &mapSize);
+		for (int i = 0; i < mapSize; i++) {
+			int key, vectorSize;
+			CopyInt(tbuff, &key);
+			CopyInt(tbuff, &vectorSize);
+			for (int j = 0; j < vectorSize; j++) {
+				LightListStruct tmpLight;
+				CopyInt(tbuff, &tmpLight._lx);
+				CopyInt(tbuff, &tmpLight._ly);
+				CopyInt(tbuff, &tmpLight._lradius);
+				CopyInt(tbuff, &tmpLight._lcolor);
+				staticLights[key].push_back(tmpLight);
+			}
+		}
+		mem_free_dbg(LoadBuff);
+	}
+#endif
 	pfile_get_game_name(szName);
 	LoadBuff = pfile_read(szName, &dwLen);
 	tbuff = LoadBuff;
@@ -215,7 +241,7 @@ void CopyBytes(const void *src, const int n, void *dst)
 
 void CopyChar(const void *src, void *dst)
 {
-	*(char*)dst = *(char*)src;
+	*(char*)dst = *(char *)src;
 	tbuff += 1;
 }
 
@@ -779,7 +805,7 @@ void LoadLighting(int i)
 	CopyInt(tbuff, &pLight->_lid);
 	CopyInt(tbuff, &pLight->_ldel);
 	CopyInt(tbuff, &pLight->_lunflag);
-	CopyInt(tbuff, &pLight->field_18);
+	CopyInt(tbuff, &pLight->_lcolor);
 	CopyInt(tbuff, &pLight->_lunx);
 	CopyInt(tbuff, &pLight->_luny);
 	CopyInt(tbuff, &pLight->_lunr);
@@ -798,7 +824,7 @@ void LoadVision(int i)
 	CopyInt(tbuff, &pVision->_lid);
 	CopyInt(tbuff, &pVision->_ldel);
 	CopyInt(tbuff, &pVision->_lunflag);
-	CopyInt(tbuff, &pVision->field_18);
+	CopyInt(tbuff, &pVision->_lcolor);
 	CopyInt(tbuff, &pVision->_lunx);
 	CopyInt(tbuff, &pVision->_luny);
 	CopyInt(tbuff, &pVision->_lunr);
@@ -957,6 +983,40 @@ void SaveGame()
 	dwLen = codec_get_encoded_len(tbuff - SaveBuff);
 	pfile_write_save_file(szName, SaveBuff, tbuff - SaveBuff, dwLen);
 	mem_free_dbg(SaveBuff);
+#ifdef PIXEL_LIGHT
+	int staticSize = 1;
+	for (std::map<int, std::vector<LightListStruct>>::iterator it = staticLights.begin(); it != staticLights.end(); ++it) {
+		staticSize += it->second.size() * 4 + 2;
+	}
+	//1 for map size, 4 for every vector element, 2 per vector for key and vector size
+	staticSize *= 4;
+	dwLen = codec_get_encoded_len(staticSize);
+	SaveBuff = DiabloAllocPtr(dwLen);
+	tbuff = SaveBuff;
+	int num = staticLights.size();
+	CopyInt(&num, tbuff);
+
+	for (std::map<int, std::vector<LightListStruct>>::iterator it = staticLights.begin(); it != staticLights.end(); ++it) {
+		num = it->first;
+		CopyInt(&num, tbuff);
+		num = it->second.size();
+		CopyInt(&num, tbuff);
+		for (int j = 0; j < it->second.size(); j++) {
+			num = it->second[j]._lx;
+			CopyInt(&num, tbuff);
+			num = it->second[j]._ly;
+			CopyInt(&num, tbuff);
+			num = it->second[j]._lradius;
+			CopyInt(&num, tbuff);
+			num = it->second[j]._lcolor;
+			CopyInt(&num, tbuff);
+		}
+	}
+
+	dwLen = codec_get_encoded_len(tbuff - SaveBuff);
+	pfile_write_save_file("staticlights", SaveBuff, tbuff - SaveBuff, dwLen);
+	mem_free_dbg(SaveBuff);
+#endif
 	gbValidSaveFile = TRUE;
 	pfile_rename_temp_to_perm();
 	pfile_write_hero();
@@ -1497,7 +1557,7 @@ void SaveLighting(int i)
 	CopyInt(&pLight->_lid, tbuff);
 	CopyInt(&pLight->_ldel, tbuff);
 	CopyInt(&pLight->_lunflag, tbuff);
-	CopyInt(&pLight->field_18, tbuff);
+	CopyInt(&pLight->_lcolor, tbuff);
 	CopyInt(&pLight->_lunx, tbuff);
 	CopyInt(&pLight->_luny, tbuff);
 	CopyInt(&pLight->_lunr, tbuff);
@@ -1516,7 +1576,7 @@ void SaveVision(int i)
 	CopyInt(&pVision->_lid, tbuff);
 	CopyInt(&pVision->_ldel, tbuff);
 	CopyInt(&pVision->_lunflag, tbuff);
-	CopyInt(&pVision->field_18, tbuff);
+	CopyInt(&pVision->_lcolor, tbuff);
 	CopyInt(&pVision->_lunx, tbuff);
 	CopyInt(&pVision->_luny, tbuff);
 	CopyInt(&pVision->_lunr, tbuff);

Source/misdat.cpp

@@ -32,7 +32,11 @@ MissileData missiledata[] = {
 	{  MIS_FLARE,         &AddFlare,         &MI_Firebolt,      TRUE,      1, MISR_MAGIC,     MFILE_FLARE,    -1,          -1          },
 	{  MIS_MISEXP2,       &AddMisexp,        &MI_Misexp,        TRUE,      2, MISR_MAGIC,     MFILE_FLAREEXP, -1,          -1          },
 	{  MIS_TELEPORT,      &AddTeleport,      &MI_Teleport,      FALSE,     1, 0,              MFILE_NONE,     LS_ELEMENTL, -1          },
+#ifdef PIXEL_LIGHT
+	{  MIS_FARROW,        &AddFArrow,        &MI_LArrow,        TRUE,      0, MISR_FIRE,      MFILE_FARROW,   -1,          -1          },
+#else
 	{  MIS_FARROW,        &AddLArrow,        &MI_LArrow,        TRUE,      0, MISR_FIRE,      MFILE_FARROW,   -1,          -1          },
+#endif
 	{  MIS_DOOMSERP,      NULL,              NULL,              FALSE,     1, MISR_MAGIC,     MFILE_DOOM,     LS_DSERP,    -1          },
 	{  MIS_FIREWALLA,     &miss_null_1D,     &MI_Firewall,      TRUE,      2, MISR_FIRE,      MFILE_FIREWAL,  -1,          -1          },
 	{  MIS_STONE,         &AddStone,         &MI_Stone,         FALSE,     1, MISR_MAGIC,     MFILE_NONE,     LS_SCURIMP,  -1          },