* Added readable/writeable window for items.

* Now always shows player and tiles immediately surrounding him.

Author: Nate Fries

console.cpp

@@ -578,3 +578,12 @@ void Console::dumpText()
 	}
 	fclose(f);
 }
+int Console::getHeight()
+{
+    // TODO (nfries88): use this to adjust the starting height for paintConsole and getConsoleEntryAt;
+        //
+    int height = 0;
+    for (std::vector<ConsoleEntry>::reverse_iterator it=m_content.rbegin(); it!=m_content.rend(); it++) {
+		height += (*it).getHeight();
+	}
+}

console.h

@@ -133,6 +133,8 @@ class Console {
 		ConsoleEntry* getConsoleEntryAt(float relx, float rely);
 		void clearEntries();
 		void dumpText();
+
+		int getHeight();
 	private:
 		std::vector <ConsoleEntry> m_content;
 		std::string m_speakername;

gamecontent/item.h

@@ -47,6 +47,8 @@ class Item : public Thing, public ItemUI
 	// items with 0x06 property?
 	bool isAlwaysUsed() const { return m_it->alwaysUsed; }
 
+	bool isWriteable() const { return m_it->writeable; }
+
 	const ObjectType* getObjectType() const {return m_it;}
 
 	virtual uint32_t getOrder() const {return getAlwaysOnTopLevel();}

gm_gameworld.cpp

@@ -114,6 +114,16 @@ void pnlInventory_t::onClick_Options(glictPos* relmousepos, glictContainer* call
     /*gameclass->msgBox(gettext("This functionality is not yet finished"),"TODO");*/
 }
 
+void winReadable_t::onClose(glictPos* pos, glictContainer* caller){
+    // TODO
+    winReadable_t* win = (winReadable_t*)caller->GetCustomData();
+    GM_Gameworld* gameclass = (GM_Gameworld*)g_game;
+    win->window.SetVisible(false);
+    if(win->dispItem->isWriteable()){
+        gameclass->m_protocol->sendTextWindow(win->windowID, win->txtText.GetCaption());
+    }
+}
+
 GM_Gameworld::GM_Gameworld() : pnlMap(&m_automap)
 {
 	DEBUGPRINT(DEBUGPRINT_LEVEL_OBLIGATORY, DEBUGPRINT_NORMAL, "Starting gameworld...\n");
@@ -247,6 +257,9 @@ GM_Gameworld::GM_Gameworld() : pnlMap(&m_automap)
 	desktop.AddObject(&winMove.window);
 	winMove.window.SetVisible(false);
 
+	desktop.AddObject(&winReadable.window);
+	winReadable.window.SetVisible(false);
+
     desktop.AddObject(&pnlConsoleContainer);
     //pnlConsoleContainer.SetBGActiveness(false);
 
@@ -1613,6 +1626,15 @@ void GM_Gameworld::closeTradeWindow()
 	#endif
 }
 
+void GM_Gameworld::onOpenItemText(int windowId, int itemid, int maxTextLenght,
+		const std::string& text, const std::string& lastChange,
+		const std::string& lastChangeDate)
+{
+    // rest of stuff; todo
+    winReadable.open(itemid, windowId, text, lastChange, lastChangeDate);
+    centerWindow(&winReadable.window);
+}
+
 void GM_Gameworld::onUpdatePlayerCash(uint32_t newcash) {
     winShop.setCash(newcash);
 }

gm_gameworld.h

@@ -35,6 +35,7 @@
 #include "ui/minimap.h"
 #include "ui/exitwarning.h"
 #include "ui/deathnotification.h"
+#include "ui/uireadable.h"
 #include "stackpanel.h"
 #include "automap.h"
 #include "statusmsg.h"
@@ -91,6 +92,9 @@ class GM_Gameworld : public GameModeOptions {
     void closeShopWindow();
     void openTradeWindow(bool ack);
     void closeTradeWindow();
+    void onOpenItemText(int windowId, int itemid, int maxTextLenght,
+		const std::string& text, const std::string& lastChange,
+		const std::string& lastChangeDate);
     void openOutfitWindow(const Outfit_t& current, const std::list<AvailOutfit_t>& available);
     void onTileUpdate(const Position& pos);
     void openDeathWindow();
@@ -180,6 +184,7 @@ class GM_Gameworld : public GameModeOptions {
     std::vector<winContainer_t*> containers;
 
     winItemMove_t winMove;
+    winReadable_t winReadable;
 
     exitWarning_t m_exitWarningWindow;
     deathNotice_t m_deathNotice;
@@ -235,6 +240,7 @@ class GM_Gameworld : public GameModeOptions {
 	friend class winVIP_t;
 	friend class winAddVIP_t;
 	friend class winChangeVIP_t;
+	friend class winReadable_t;
 
 	MapUI m_mapui;
 

mapui.cpp

@@ -525,7 +525,9 @@ void MapUI::renderMap()
 	}
 
 	if(options.showlighteffects){
-	    if(lightmap[((pos.y * m_vpw) + pos.x)].alpha >= 100) fillLightCircle(pos.x, pos.y, 2, initColor);
+	    if((player != NULL) && !(player->getLightLevel())){
+	        fillLightCircle(m_vpw/2, m_vph/2, 2, initColor);
+	    }
         g_engine->drawLightmap(lightmap, options.showlighteffects, m_vpw, m_vph, m_scale);
 	}
 

net/protocolgame.cpp

@@ -295,6 +295,7 @@ bool ProtocolGame::parseSelfAppear(NetworkMessage& msg)
     GlobalVariables::clear();
     Inventory::getInstance().clear();
     Map::getInstance().clear();
+    Creatures::getInstance().addCreature(ourID);
     //TODO. reset chats
 
     GlobalVariables::setPlayerID(ourID);

objects.cpp

@@ -63,6 +63,7 @@ ObjectType::ObjectType(uint16_t _id)
 	useable = false;
 	rune = false;
 	readable = false;
+	writeable = false;
 	fluidContainer = false;
 	splash = false;
 	blockSolid = false;
@@ -362,6 +363,7 @@ bool Objects::load780plus(const char* filename)
 					break;
 				case 0x09: //Writtable/Readable Objectss
 						oType->readable = true;
+						oType->writeable = true;
 						yatc_fread(&read_short2, sizeof(read_short2), 1, fp); //maximum size of text entry TODO (ivucica#3#) store this data
                         ECORR16(read_short);
 						break;

objects.h

@@ -89,6 +89,7 @@ class ObjectType
 	bool useable;
 	bool rune;
 	bool readable;
+	bool writeable;
 	bool fluidContainer;
 	bool splash;
 	bool blockSolid;

sprite.cpp

@@ -370,7 +370,9 @@ void Sprite::loadSurfaceFromFile(const std::string& filename, int index) {
 
         fgetc(f); // number of colors; ignore
         fgetc(f); // always 0
-        yatc_fread(&read_short, sizeof(read_short), 1, f); // color planes, whatever those are
+        uint16_t colorplanes;
+        yatc_fread(&colorplanes, sizeof(colorplanes), 1, f); // color planes, whatever those are
+        if(colorplanes == 0) colorplanes = 1;
 
         uint16_t bbp;
         yatc_fread(&bbp, sizeof(bbp), 1, f); // bits per pixel
@@ -389,7 +391,7 @@ void Sprite::loadSurfaceFromFile(const std::string& filename, int index) {
         }
         yatc_fread(pixels, 1, size, f); // pixel data
 
-        m_image = SDL_CreateRGBSurfaceFrom(pixels, width, height, bbp, 1, rmask, gmask, bmask, amask);
+        m_image = SDL_CreateRGBSurfaceFrom(pixels, width, height, bbp * colorplanes, 1, rmask, gmask, bmask, amask);
         delete [] pixels;
 
         if(!m_image){ // out of memory or SDL failure