test

git-svn-id: http://svn.net-core.org/repos/t-engine4@4212 51575b47-30f0-44d4-a5cc-537603b46e54

game/engines/default/engine/HotkeysIconsDisplay.lua

@@ -258,8 +258,13 @@ function _M:onMouse(button, mx, my, click, on_over, on_click)
 				else
 					if a.hotkey[i][1] == "talent" then
 						local t = self.actor:getTalentFromId(a.hotkey[i][2])
-						local s = t.display_entity:getEntityFinalSurface(nil, 64, 64)
+--						local s = t.display_entity:getEntityFinalSurface(nil, 64, 64)
+--						game.mouse:startDrag(mx, my, s, {kind=a.hotkey[i][1], id=a.hotkey[i][2], source_hotkey_slot=i}, function(drag, used) if not used then self.actor.hotkey[i] = nil self.actor.changed = true end end)
+						local e = t.display_entity
+						local tex = game.level.map.tiles:get(e.display, e.color_r, e.color_g, e.color_b, e.color_br, e.color_bg, e.color_bb, e.image, e._noalpha and 255, e.ascii_outline, true)
+						local s = tex:toSurface()
 						game.mouse:startDrag(mx, my, s, {kind=a.hotkey[i][1], id=a.hotkey[i][2], source_hotkey_slot=i}, function(drag, used) if not used then self.actor.hotkey[i] = nil self.actor.changed = true end end)
+
 					elseif a.hotkey[i][1] == "inventory" then
 						local o = a:findInAllInventories(a.hotkey[i][2], {no_add_name=true, force_id=true, no_count=true})
 						local s = nil

src/tgl.h

@@ -38,7 +38,7 @@ extern GLenum gl_c_texture_unit;
 extern GLenum gl_c_texture;
 #define tglBindTexture(w, t) \
 	{ \
-	glBindTexture((w), (t)); gl_c_texture=(t); \
+	if ((t) != gl_c_texture) { glBindTexture((w), (t)); gl_c_texture=(t); } \
 	}
 #define tfglBindTexture(w, t) \
 	{ \